Service name schema

Second attempt to merge changes after #10.

Unit tests were updated to contemplate the changes.