rename MB class to something more managable