a whole lotta renaming going on