misc renaming etc