Changed naming convention to camel case