Fix service and route module names