Renaming for lower-case and hyphenation consistency