MBST-1466 Reflects movement of core classes