Fixed types - changing from lowercase to upper case class names.
Fixed types, moved 2 classes in