updated naming conventions
changed naming conventions