Renaming things and removing constructors