somewhat rectify the naming convention weirdness
CamelCase -> hyphen-separated