unambiguous naming of archetypes
renamed archetypes for consistency