Fix for rename