Renamefix

Port of hotfix for the rename bug into devleop.