CMS-836 Rename SubType To Mixin