Changes to naming convention of Services.
Updated references to Services.