changed naming convention to camel case