rename all things, again