Refactored for better naming conventions

naming conventions improved for various