other fixes for renaming