Renames, simplifications