Realign mixin names with interface names
3 files changed