Naming conventions

Update naming conventions and added comments