Some fixes for rename