Misc changes renaming etc