some renaming and stuff