Naming Convention Changes

Applied new naming convention to properties/variables. No new features.