BISERVER-9972 - Fixed rename logic to work with BA and DI server
Merge pull request #820 from rmansoor/master

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