updated naming conventions
Merge branch 'refactor'