EUCA-7492

fixed lingering refs to moved classes