some renaming and whatnot