Changed Text classes to proper camel case