BISERVER-9972 - Fixed rename logic to work with BA and DI server