I would remove "service" from the config file names as they sound like a reference to the old service model