Changed dash-delimited class to camel case