Fixes for rename