Didn't want to risk collisions as some of the classes were genericly named. Also updated underscores to hyphens because reasons.
Nomen est omen