Names refactoring and add archetypes