Updated naming of the archetypes