adjusted mixin to fix names