update names for mixin