some renaming etc