Updated service names, made generic adapter