0.0.69.6

Started refractoring to new naming convention for consistency. Phase 1.