Changes name of MacroTrait to MacroableTrait