Fixed references to services.
0.1.1 finalization.