@Amro Tork Yes, I understand that updating the names requires these types of fixes -- however, we should be setting up the right automated testing and verification so we can make changes like this with confidence

@Tim 'mithro' Ansell we already have those automated tests, but some of which rely on the old names.