begin renaming MAC only classes