Changed upper case Classes to lower case classes