6s Service Compartments
6S fixups

- Fixed version
- Fixed identifier

The spec currently doesn't let identifiers start with a number.

Closes #68
Merge commit 'f6c3c08'

* commit 'f6c3c08':
  6S fixups
  6s Service Compartments