merged DefaultServiceRegistry into base
corrected class name