Shorten identifier names for archetype.
Fix incorrect license header in test class.
Other archetype cleanup.