Fix name conflict in service_maker.