Naming convention and encapsulation improvements