Renaming and improvements