Name changes to update to new version of Modern Style.