Changed the class names accordingly. Didn't see the way that has been done for the RestRouteLoader before.