Name changes and formatting