Refactored according to naming strategy in upcoming mixin project