Service configuration api update

Refactored these to be more meaningful wrt service configuration terminology that everybody has started using.

Also cleared out a couple of unused services.