Small changes to identifiers.
Merge pull request #253 from travisbrown/master

Small changes to identifiers.