Use name_foo rather than foo_name

94 files changed, 822 insertions, 822 deletions

diff --git a/paludis/action.hh b/paludis/action.hh
index 4aecaad..098f6be 100644
--- a/paludis/action.hh
+++ b/paludis/action.hh
@@ -49,25 +49,25 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct config_protect_name> config_protect;
-        typedef Name<struct destination_name> destination;
-        typedef Name<struct errors_name> errors;
-        typedef Name<struct exclude_unmirrorable_name> exclude_unmirrorable;
-        typedef Name<struct failed_automatic_fetching_name> failed_automatic_fetching;
-        typedef Name<struct failed_integrity_checks_name> failed_integrity_checks;
-        typedef Name<struct fetch_parts_name> fetch_parts;
-        typedef Name<struct if_for_install_id_name> if_for_install_id;
-        typedef Name<struct ignore_for_unmerge_name> ignore_for_unmerge;
-        typedef Name<struct ignore_unfetched_name> ignore_unfetched;
-        typedef Name<struct is_overwrite_name> is_overwrite;
-        typedef Name<struct make_output_manager_name> make_output_manager;
-        typedef Name<struct perform_uninstall_name> perform_uninstall;
-        typedef Name<struct replacing_name> replacing;
-        typedef Name<struct requires_manual_fetching_name> requires_manual_fetching;
-        typedef Name<struct safe_resume_name> safe_resume;
-        typedef Name<struct target_file_name> target_file;
-        typedef Name<struct want_phase_name> want_phase;
-        typedef Name<struct ignore_not_in_manifest_name> ignore_not_in_manifest;
+        typedef Name<struct name_config_protect> config_protect;
+        typedef Name<struct name_destination> destination;
+        typedef Name<struct name_errors> errors;
+        typedef Name<struct name_exclude_unmirrorable> exclude_unmirrorable;
+        typedef Name<struct name_failed_automatic_fetching> failed_automatic_fetching;
+        typedef Name<struct name_failed_integrity_checks> failed_integrity_checks;
+        typedef Name<struct name_fetch_parts> fetch_parts;
+        typedef Name<struct name_if_for_install_id> if_for_install_id;
+        typedef Name<struct name_ignore_for_unmerge> ignore_for_unmerge;
+        typedef Name<struct name_ignore_unfetched> ignore_unfetched;
+        typedef Name<struct name_is_overwrite> is_overwrite;
+        typedef Name<struct name_make_output_manager> make_output_manager;
+        typedef Name<struct name_perform_uninstall> perform_uninstall;
+        typedef Name<struct name_replacing> replacing;
+        typedef Name<struct name_requires_manual_fetching> requires_manual_fetching;
+        typedef Name<struct name_safe_resume> safe_resume;
+        typedef Name<struct name_target_file> target_file;
+        typedef Name<struct name_want_phase> want_phase;
+        typedef Name<struct name_ignore_not_in_manifest> ignore_not_in_manifest;
     }
 
     /**
diff --git a/paludis/args/args_option.hh b/paludis/args/args_option.hh
index 3b60c5c..3c39292 100644
--- a/paludis/args/args_option.hh
+++ b/paludis/args/args_option.hh
@@ -43,9 +43,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct description_name> description;
-        typedef Name<struct long_name_name> long_name;
-        typedef Name<struct short_name_name> short_name;
+        typedef Name<struct name_description> description;
+        typedef Name<struct name_long_name> long_name;
+        typedef Name<struct name_short_name> short_name;
     }
 
     namespace args
diff --git a/paludis/choice.hh b/paludis/choice.hh
index ba13e6a..3851f82 100644
--- a/paludis/choice.hh
+++ b/paludis/choice.hh
@@ -45,13 +45,13 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct consider_added_or_changed_name> consider_added_or_changed;
-        typedef Name<struct contains_every_value_name> contains_every_value;
-        typedef Name<struct hidden_name> hidden;
-        typedef Name<struct human_name_name> human_name;
-        typedef Name<struct prefix_name> prefix;
-        typedef Name<struct raw_name_name> raw_name;
-        typedef Name<struct show_with_no_prefix_name> show_with_no_prefix;
+        typedef Name<struct name_consider_added_or_changed> consider_added_or_changed;
+        typedef Name<struct name_contains_every_value> contains_every_value;
+        typedef Name<struct name_hidden> hidden;
+        typedef Name<struct name_human_name> human_name;
+        typedef Name<struct name_prefix> prefix;
+        typedef Name<struct name_raw_name> raw_name;
+        typedef Name<struct name_show_with_no_prefix> show_with_no_prefix;
     }
 
     /**
diff --git a/paludis/dep_spec.hh b/paludis/dep_spec.hh
index 53fb0b9..c9756a9 100644
--- a/paludis/dep_spec.hh
+++ b/paludis/dep_spec.hh
@@ -267,9 +267,9 @@ namespace paludis
 
     namespace n
     {
-        typedef Name<struct include_masked_name> include_masked;
-        typedef Name<struct path_name> path;
-        typedef Name<struct repository_name> repository;
+        typedef Name<struct name_include_masked> include_masked;
+        typedef Name<struct name_path> path;
+        typedef Name<struct name_repository> repository;
     }
 
     /**
diff --git a/paludis/dep_spec_annotations.hh b/paludis/dep_spec_annotations.hh
index 0ff5167..dc4f14f 100644
--- a/paludis/dep_spec_annotations.hh
+++ b/paludis/dep_spec_annotations.hh
@@ -30,9 +30,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct key_name> key;
-        typedef Name<struct role_name> role;
-        typedef Name<struct value_name> value;
+        typedef Name<struct name_key> key;
+        typedef Name<struct name_role> role;
+        typedef Name<struct name_value> value;
     }
 
     struct DepSpecAnnotation
diff --git a/paludis/dep_tag.hh b/paludis/dep_tag.hh
index bf64e43..fbbbdf3 100644
--- a/paludis/dep_tag.hh
+++ b/paludis/dep_tag.hh
@@ -52,8 +52,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct generation_name> generation;
-        typedef Name<struct tag_name> tag;
+        typedef Name<struct name_generation> generation;
+        typedef Name<struct name_tag> tag;
     }
 
     /**
diff --git a/paludis/distribution.hh b/paludis/distribution.hh
index 84b4e4d..5c220cd 100644
--- a/paludis/distribution.hh
+++ b/paludis/distribution.hh
@@ -44,15 +44,15 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct concept_keyword_name> concept_keyword;
-        typedef Name<struct concept_license_name> concept_license;
-        typedef Name<struct concept_use_name> concept_use;
-        typedef Name<struct default_environment_name> default_environment;
-        typedef Name<struct extra_data_dir_name> extra_data_dir;
-        typedef Name<struct fallback_environment_name> fallback_environment;
+        typedef Name<struct name_concept_keyword> concept_keyword;
+        typedef Name<struct name_concept_license> concept_license;
+        typedef Name<struct name_concept_use> concept_use;
+        typedef Name<struct name_default_environment> default_environment;
+        typedef Name<struct name_extra_data_dir> extra_data_dir;
+        typedef Name<struct name_fallback_environment> fallback_environment;
         typedef Name<struct name_name> name;
-        typedef Name<struct paludis_package_name> paludis_package;
-        typedef Name<struct support_old_style_virtuals_name> support_old_style_virtuals;
+        typedef Name<struct name_paludis_package> paludis_package;
+        typedef Name<struct name_support_old_style_virtuals> support_old_style_virtuals;
     }
 
     /**
diff --git a/paludis/elike_dep_parser.hh b/paludis/elike_dep_parser.hh
index 69aa48c..5e3eb25 100644
--- a/paludis/elike_dep_parser.hh
+++ b/paludis/elike_dep_parser.hh
@@ -27,18 +27,18 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct on_all_name> on_all;
-        typedef Name<struct on_annotations_name> on_annotations;
-        typedef Name<struct on_any_name> on_any;
-        typedef Name<struct on_arrow_name> on_arrow;
-        typedef Name<struct on_error_name> on_error;
-        typedef Name<struct on_exactly_one_name> on_exactly_one;
-        typedef Name<struct on_label_name> on_label;
-        typedef Name<struct on_pop_name> on_pop;
-        typedef Name<struct on_should_be_empty_name> on_should_be_empty;
-        typedef Name<struct on_string_name> on_string;
-        typedef Name<struct on_use_name> on_use;
-        typedef Name<struct on_use_under_any_name> on_use_under_any;
+        typedef Name<struct name_on_all> on_all;
+        typedef Name<struct name_on_annotations> on_annotations;
+        typedef Name<struct name_on_any> on_any;
+        typedef Name<struct name_on_arrow> on_arrow;
+        typedef Name<struct name_on_error> on_error;
+        typedef Name<struct name_on_exactly_one> on_exactly_one;
+        typedef Name<struct name_on_label> on_label;
+        typedef Name<struct name_on_pop> on_pop;
+        typedef Name<struct name_on_should_be_empty> on_should_be_empty;
+        typedef Name<struct name_on_string> on_string;
+        typedef Name<struct name_on_use> on_use;
+        typedef Name<struct name_on_use_under_any> on_use_under_any;
     }
 
     struct ELikeDepParserCallbacks
diff --git a/paludis/elike_package_dep_spec.hh b/paludis/elike_package_dep_spec.hh
index 201710e..25e9041 100644
--- a/paludis/elike_package_dep_spec.hh
+++ b/paludis/elike_package_dep_spec.hh
@@ -27,16 +27,16 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct add_package_requirement_name> add_package_requirement;
-        typedef Name<struct add_version_requirement_name> add_version_requirement;
-        typedef Name<struct check_sanity_name> check_sanity;
-        typedef Name<struct get_remove_trailing_version_name> get_remove_trailing_version;
-        typedef Name<struct get_remove_version_operator_name> get_remove_version_operator;
-        typedef Name<struct has_version_operator_name> has_version_operator;
-        typedef Name<struct options_for_partially_made_package_dep_spec_name> options_for_partially_made_package_dep_spec;
-        typedef Name<struct remove_trailing_repo_if_exists_name> remove_trailing_repo_if_exists;
-        typedef Name<struct remove_trailing_slot_if_exists_name> remove_trailing_slot_if_exists;
-        typedef Name<struct remove_trailing_square_bracket_if_exists_name> remove_trailing_square_bracket_if_exists;
+        typedef Name<struct name_add_package_requirement> add_package_requirement;
+        typedef Name<struct name_add_version_requirement> add_version_requirement;
+        typedef Name<struct name_check_sanity> check_sanity;
+        typedef Name<struct name_get_remove_trailing_version> get_remove_trailing_version;
+        typedef Name<struct name_get_remove_version_operator> get_remove_version_operator;
+        typedef Name<struct name_has_version_operator> has_version_operator;
+        typedef Name<struct name_options_for_partially_made_package_dep_spec> options_for_partially_made_package_dep_spec;
+        typedef Name<struct name_remove_trailing_repo_if_exists> remove_trailing_repo_if_exists;
+        typedef Name<struct name_remove_trailing_slot_if_exists> remove_trailing_slot_if_exists;
+        typedef Name<struct name_remove_trailing_square_bracket_if_exists> remove_trailing_square_bracket_if_exists;
     }
 
     struct GenericELikePackageDepSpecParseFunctions
diff --git a/paludis/environments/no_config/no_config_environment.hh b/paludis/environments/no_config/no_config_environment.hh
index 89d699f..04796c3 100644
--- a/paludis/environments/no_config/no_config_environment.hh
+++ b/paludis/environments/no_config/no_config_environment.hh
@@ -28,16 +28,16 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct accept_unstable_name> accept_unstable;
-        typedef Name<struct disable_metadata_cache_name> disable_metadata_cache;
-        typedef Name<struct extra_accept_keywords_name> extra_accept_keywords;
-        typedef Name<struct extra_params_name> extra_params;
-        typedef Name<struct extra_repository_dirs_name> extra_repository_dirs;
-        typedef Name<struct master_repository_name_name> master_repository_name;
-        typedef Name<struct profiles_if_not_auto_name> profiles_if_not_auto;
-        typedef Name<struct repository_dir_name> repository_dir;
-        typedef Name<struct repository_type_name> repository_type;
-        typedef Name<struct write_cache_name> write_cache;
+        typedef Name<struct name_accept_unstable> accept_unstable;
+        typedef Name<struct name_disable_metadata_cache> disable_metadata_cache;
+        typedef Name<struct name_extra_accept_keywords> extra_accept_keywords;
+        typedef Name<struct name_extra_params> extra_params;
+        typedef Name<struct name_extra_repository_dirs> extra_repository_dirs;
+        typedef Name<struct name_master_repository_name> master_repository_name;
+        typedef Name<struct name_profiles_if_not_auto> profiles_if_not_auto;
+        typedef Name<struct name_repository_dir> repository_dir;
+        typedef Name<struct name_repository_type> repository_type;
+        typedef Name<struct name_write_cache> write_cache;
     }
 
     namespace no_config_environment
diff --git a/paludis/environments/paludis/extra_distribution_data.hh b/paludis/environments/paludis/extra_distribution_data.hh
index 09b05ab..be55b45 100644
--- a/paludis/environments/paludis/extra_distribution_data.hh
+++ b/paludis/environments/paludis/extra_distribution_data.hh
@@ -28,20 +28,20 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct bashrc_filename_name> bashrc_filename;
-        typedef Name<struct info_messages_are_spam_name> info_messages_are_spam;
-        typedef Name<struct keywords_filename_part_name> keywords_filename_part;
-        typedef Name<struct licenses_filename_part_name> licenses_filename_part;
-        typedef Name<struct mandatory_userpriv_name> mandatory_userpriv;
-        typedef Name<struct mirrors_filename_part_name> mirrors_filename_part;
-        typedef Name<struct output_filename_part_name> output_filename_part;
-        typedef Name<struct output_managers_directory_name> output_managers_directory;
-        typedef Name<struct package_mask_filename_part_name> package_mask_filename_part;
-        typedef Name<struct package_unmask_filename_part_name> package_unmask_filename_part;
-        typedef Name<struct repositories_directory_name> repositories_directory;
-        typedef Name<struct repository_defaults_filename_part_name> repository_defaults_filename_part;
-        typedef Name<struct suggestions_filename_part_name> suggestions_filename_part;
-        typedef Name<struct use_filename_part_name> use_filename_part;
+        typedef Name<struct name_bashrc_filename> bashrc_filename;
+        typedef Name<struct name_info_messages_are_spam> info_messages_are_spam;
+        typedef Name<struct name_keywords_filename_part> keywords_filename_part;
+        typedef Name<struct name_licenses_filename_part> licenses_filename_part;
+        typedef Name<struct name_mandatory_userpriv> mandatory_userpriv;
+        typedef Name<struct name_mirrors_filename_part> mirrors_filename_part;
+        typedef Name<struct name_output_filename_part> output_filename_part;
+        typedef Name<struct name_output_managers_directory> output_managers_directory;
+        typedef Name<struct name_package_mask_filename_part> package_mask_filename_part;
+        typedef Name<struct name_package_unmask_filename_part> package_unmask_filename_part;
+        typedef Name<struct name_repositories_directory> repositories_directory;
+        typedef Name<struct name_repository_defaults_filename_part> repository_defaults_filename_part;
+        typedef Name<struct name_suggestions_filename_part> suggestions_filename_part;
+        typedef Name<struct name_use_filename_part> use_filename_part;
     }
 
     namespace paludis_environment
diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc
index adef984..a97ec18 100644
--- a/paludis/environments/paludis/output_conf.cc
+++ b/paludis/environments/paludis/output_conf.cc
@@ -57,13 +57,13 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct action_requirement_name> action_requirement;
-        typedef Name<struct ignore_unfetched_requirement_name> ignore_unfetched_requirement;
-        typedef Name<struct manager_name> manager;
-        typedef Name<struct matches_requirement_name> matches_requirement;
-        typedef Name<struct name_requirement_name> name_requirement;
-        typedef Name<struct output_exclusivity_requirement_name> output_exclusivity_requirement;
-        typedef Name<struct type_requirement_name> type_requirement;
+        typedef Name<struct name_action_requirement> action_requirement;
+        typedef Name<struct name_ignore_unfetched_requirement> ignore_unfetched_requirement;
+        typedef Name<struct name_manager> manager;
+        typedef Name<struct name_matches_requirement> matches_requirement;
+        typedef Name<struct name_name_requirement> name_requirement;
+        typedef Name<struct name_output_exclusivity_requirement> output_exclusivity_requirement;
+        typedef Name<struct name_type_requirement> type_requirement;
     }
 }
 
diff --git a/paludis/fs_merger.hh b/paludis/fs_merger.hh
index aae23c0..859f6e8 100644
--- a/paludis/fs_merger.hh
+++ b/paludis/fs_merger.hh
@@ -48,16 +48,16 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct fix_mtimes_before_name> fix_mtimes_before;
-        typedef Name<struct get_new_ids_or_minus_one_name> get_new_ids_or_minus_one;
-        typedef Name<struct image_name> image;
-        typedef Name<struct install_under_name> install_under;
-        typedef Name<struct maybe_output_manager_name> maybe_output_manager;
-        typedef Name<struct merged_entries_name> merged_entries;
-        typedef Name<struct no_chown_name> no_chown;
-        typedef Name<struct options_name> options;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_fix_mtimes_before> fix_mtimes_before;
+        typedef Name<struct name_get_new_ids_or_minus_one> get_new_ids_or_minus_one;
+        typedef Name<struct name_image> image;
+        typedef Name<struct name_install_under> install_under;
+        typedef Name<struct name_maybe_output_manager> maybe_output_manager;
+        typedef Name<struct name_merged_entries> merged_entries;
+        typedef Name<struct name_no_chown> no_chown;
+        typedef Name<struct name_options> options;
+        typedef Name<struct name_root> root;
     }
 
     /**
diff --git a/paludis/hook.hh b/paludis/hook.hh
index 93abbff..35c6392 100644
--- a/paludis/hook.hh
+++ b/paludis/hook.hh
@@ -47,8 +47,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct max_exit_status_name> max_exit_status;
-        typedef Name<struct output_name> output;
+        typedef Name<struct name_max_exit_status> max_exit_status;
+        typedef Name<struct name_output> output;
     }
 
     /**
diff --git a/paludis/legacy/dep_list.hh b/paludis/legacy/dep_list.hh
index e1ab38e..036d977 100644
--- a/paludis/legacy/dep_list.hh
+++ b/paludis/legacy/dep_list.hh
@@ -49,35 +49,35 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct associated_entry_name> associated_entry;
-        typedef Name<struct blocks_name> blocks;
-        typedef Name<struct circular_name> circular;
-        typedef Name<struct dependency_tags_name> dependency_tags;
-        typedef Name<struct destination_name> destination;
-        typedef Name<struct downgrade_name> downgrade;
-        typedef Name<struct fall_back_name> fall_back;
-        typedef Name<struct generation_name> generation;
-        typedef Name<struct handled_name> handled;
-        typedef Name<struct installed_deps_post_name> installed_deps_post;
-        typedef Name<struct installed_deps_pre_name> installed_deps_pre;
-        typedef Name<struct installed_deps_runtime_name> installed_deps_runtime;
-        typedef Name<struct kind_name> kind;
-        typedef Name<struct match_package_options_name> match_package_options;
-        typedef Name<struct new_slots_name> new_slots;
-        typedef Name<struct override_masks_name> override_masks;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct reinstall_name> reinstall;
-        typedef Name<struct reinstall_scm_name> reinstall_scm;
-        typedef Name<struct state_name> state;
-        typedef Name<struct suggested_name> suggested;
-        typedef Name<struct tags_name> tags;
-        typedef Name<struct target_type_name> target_type;
-        typedef Name<struct uninstalled_deps_post_name> uninstalled_deps_post;
-        typedef Name<struct uninstalled_deps_pre_name> uninstalled_deps_pre;
-        typedef Name<struct uninstalled_deps_runtime_name> uninstalled_deps_runtime;
-        typedef Name<struct uninstalled_deps_suggested_name> uninstalled_deps_suggested;
-        typedef Name<struct upgrade_name> upgrade;
-        typedef Name<struct use_name> use;
+        typedef Name<struct name_associated_entry> associated_entry;
+        typedef Name<struct name_blocks> blocks;
+        typedef Name<struct name_circular> circular;
+        typedef Name<struct name_dependency_tags> dependency_tags;
+        typedef Name<struct name_destination> destination;
+        typedef Name<struct name_downgrade> downgrade;
+        typedef Name<struct name_fall_back> fall_back;
+        typedef Name<struct name_generation> generation;
+        typedef Name<struct name_handled> handled;
+        typedef Name<struct name_installed_deps_post> installed_deps_post;
+        typedef Name<struct name_installed_deps_pre> installed_deps_pre;
+        typedef Name<struct name_installed_deps_runtime> installed_deps_runtime;
+        typedef Name<struct name_kind> kind;
+        typedef Name<struct name_match_package_options> match_package_options;
+        typedef Name<struct name_new_slots> new_slots;
+        typedef Name<struct name_override_masks> override_masks;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_reinstall> reinstall;
+        typedef Name<struct name_reinstall_scm> reinstall_scm;
+        typedef Name<struct name_state> state;
+        typedef Name<struct name_suggested> suggested;
+        typedef Name<struct name_tags> tags;
+        typedef Name<struct name_target_type> target_type;
+        typedef Name<struct name_uninstalled_deps_post> uninstalled_deps_post;
+        typedef Name<struct name_uninstalled_deps_pre> uninstalled_deps_pre;
+        typedef Name<struct name_uninstalled_deps_runtime> uninstalled_deps_runtime;
+        typedef Name<struct name_uninstalled_deps_suggested> uninstalled_deps_suggested;
+        typedef Name<struct name_upgrade> upgrade;
+        typedef Name<struct name_use> use;
     }
 
     /**
diff --git a/paludis/legacy/uninstall_list.hh b/paludis/legacy/uninstall_list.hh
index 281b0a8..eafeed4 100644
--- a/paludis/legacy/uninstall_list.hh
+++ b/paludis/legacy/uninstall_list.hh
@@ -42,12 +42,12 @@ namespace paludis
 
     namespace n
     {
-        typedef Name<struct kind_name> kind;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct tags_name> tags;
-        typedef Name<struct with_dependencies_as_errors_name> with_dependencies_as_errors;
-        typedef Name<struct with_dependencies_included_name> with_dependencies_included;
-        typedef Name<struct with_unused_dependencies_name> with_unused_dependencies;
+        typedef Name<struct name_kind> kind;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_tags> tags;
+        typedef Name<struct name_with_dependencies_as_errors> with_dependencies_as_errors;
+        typedef Name<struct name_with_dependencies_included> with_dependencies_included;
+        typedef Name<struct name_with_unused_dependencies> with_unused_dependencies;
     }
 
     /**
diff --git a/paludis/mask.hh b/paludis/mask.hh
index 727a01f..87bc8fa 100644
--- a/paludis/mask.hh
+++ b/paludis/mask.hh
@@ -45,10 +45,10 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct comment_name> comment;
-        typedef Name<struct mask_name> mask;
-        typedef Name<struct mask_file_name> mask_file;
-        typedef Name<struct override_reason_name> override_reason;
+        typedef Name<struct name_comment> comment;
+        typedef Name<struct name_mask> mask;
+        typedef Name<struct name_mask_file> mask_file;
+        typedef Name<struct name_override_reason> override_reason;
     }
 
     /**
diff --git a/paludis/merger.hh b/paludis/merger.hh
index 2571564..eb7b842 100644
--- a/paludis/merger.hh
+++ b/paludis/merger.hh
@@ -34,16 +34,16 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct fix_mtimes_before_name> fix_mtimes_before;
-        typedef Name<struct get_new_ids_or_minus_one_name> get_new_ids_or_minus_one;
-        typedef Name<struct image_name> image;
-        typedef Name<struct install_under_name> install_under;
-        typedef Name<struct maybe_output_manager_name> maybe_output_manager;
-        typedef Name<struct merged_entries_name> merged_entries;
-        typedef Name<struct no_chown_name> no_chown;
-        typedef Name<struct options_name> options;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_fix_mtimes_before> fix_mtimes_before;
+        typedef Name<struct name_get_new_ids_or_minus_one> get_new_ids_or_minus_one;
+        typedef Name<struct name_image> image;
+        typedef Name<struct name_install_under> install_under;
+        typedef Name<struct name_maybe_output_manager> maybe_output_manager;
+        typedef Name<struct name_merged_entries> merged_entries;
+        typedef Name<struct name_no_chown> no_chown;
+        typedef Name<struct name_options> options;
+        typedef Name<struct name_root> root;
     }
 
     /**
diff --git a/paludis/ndbam.hh b/paludis/ndbam.hh
index f338bd1..82dc8d0 100644
--- a/paludis/ndbam.hh
+++ b/paludis/ndbam.hh
@@ -37,13 +37,13 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct fs_location_name> fs_location;
-        typedef Name<struct magic_name> magic;
-        typedef Name<struct mutex_name> mutex;
+        typedef Name<struct name_fs_location> fs_location;
+        typedef Name<struct name_magic> magic;
+        typedef Name<struct name_mutex> mutex;
         typedef Name<struct name_name> name;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct slot_name> slot;
-        typedef Name<struct version_name> version;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_slot> slot;
+        typedef Name<struct name_version> version;
     }
 
     struct NDBAMEntry
diff --git a/paludis/ndbam_merger.hh b/paludis/ndbam_merger.hh
index 81a2ba3..6d55615 100644
--- a/paludis/ndbam_merger.hh
+++ b/paludis/ndbam_merger.hh
@@ -30,19 +30,19 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct config_protect_name> config_protect;
-        typedef Name<struct config_protect_mask_name> config_protect_mask;
-        typedef Name<struct contents_file_name> contents_file;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct fix_mtimes_before_name> fix_mtimes_before;
-        typedef Name<struct get_new_ids_or_minus_one_name> get_new_ids_or_minus_one;
-        typedef Name<struct image_name> image;
-        typedef Name<struct install_under_name> install_under;
-        typedef Name<struct merged_entries_name> merged_entries;
-        typedef Name<struct options_name> options;
-        typedef Name<struct output_manager_name> output_manager;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_config_protect> config_protect;
+        typedef Name<struct name_config_protect_mask> config_protect_mask;
+        typedef Name<struct name_contents_file> contents_file;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_fix_mtimes_before> fix_mtimes_before;
+        typedef Name<struct name_get_new_ids_or_minus_one> get_new_ids_or_minus_one;
+        typedef Name<struct name_image> image;
+        typedef Name<struct name_install_under> install_under;
+        typedef Name<struct name_merged_entries> merged_entries;
+        typedef Name<struct name_options> options;
+        typedef Name<struct name_output_manager> output_manager;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_root> root;
     }
 
     struct NDBAMMergerParams
diff --git a/paludis/ndbam_unmerger.hh b/paludis/ndbam_unmerger.hh
index 84419b2..57aca9c 100644
--- a/paludis/ndbam_unmerger.hh
+++ b/paludis/ndbam_unmerger.hh
@@ -32,15 +32,15 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct config_protect_name> config_protect;
-        typedef Name<struct config_protect_mask_name> config_protect_mask;
-        typedef Name<struct contents_file_name> contents_file;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct ignore_name> ignore;
-        typedef Name<struct ndbam_name> ndbam;
-        typedef Name<struct output_manager_name> output_manager;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_config_protect> config_protect;
+        typedef Name<struct name_config_protect_mask> config_protect_mask;
+        typedef Name<struct name_contents_file> contents_file;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_ignore> ignore;
+        typedef Name<struct name_ndbam> ndbam;
+        typedef Name<struct name_output_manager> output_manager;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_root> root;
     }
 
     class NDBAM;
diff --git a/paludis/output_manager_factory.cc b/paludis/output_manager_factory.cc
index 4d2d4b6..cb1b192 100644
--- a/paludis/output_manager_factory.cc
+++ b/paludis/output_manager_factory.cc
@@ -46,7 +46,7 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct create_function_name> create_function;
+        typedef Name<struct name_create_function> create_function;
     }
 }
 
diff --git a/paludis/package_dep_spec_properties.hh b/paludis/package_dep_spec_properties.hh
index dd8ee4b..45ed0fa 100644
--- a/paludis/package_dep_spec_properties.hh
+++ b/paludis/package_dep_spec_properties.hh
@@ -28,18 +28,18 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct has_additional_requirements_name> has_additional_requirements;
-        typedef Name<struct has_category_name_part_name> has_category_name_part;
-        typedef Name<struct has_from_repository_name> has_from_repository;
-        typedef Name<struct has_in_repository_name> has_in_repository;
-        typedef Name<struct has_installable_to_path_name> has_installable_to_path;
-        typedef Name<struct has_installable_to_repository_name> has_installable_to_repository;
-        typedef Name<struct has_installed_at_path_name> has_installed_at_path;
-        typedef Name<struct has_package_name> has_package;
-        typedef Name<struct has_package_name_part_name> has_package_name_part;
-        typedef Name<struct has_slot_requirement_name> has_slot_requirement;
-        typedef Name<struct has_tag_name> has_tag;
-        typedef Name<struct has_version_requirements_name> has_version_requirements;
+        typedef Name<struct name_has_additional_requirements> has_additional_requirements;
+        typedef Name<struct name_has_category_name_part> has_category_name_part;
+        typedef Name<struct name_has_from_repository> has_from_repository;
+        typedef Name<struct name_has_in_repository> has_in_repository;
+        typedef Name<struct name_has_installable_to_path> has_installable_to_path;
+        typedef Name<struct name_has_installable_to_repository> has_installable_to_repository;
+        typedef Name<struct name_has_installed_at_path> has_installed_at_path;
+        typedef Name<struct name_has_package> has_package;
+        typedef Name<struct name_has_package_name_part> has_package_name_part;
+        typedef Name<struct name_has_slot_requirement> has_slot_requirement;
+        typedef Name<struct name_has_tag> has_tag;
+        typedef Name<struct name_has_version_requirements> has_version_requirements;
     }
 
     /**
diff --git a/paludis/paludislike_options_conf.cc b/paludis/paludislike_options_conf.cc
index b9f1023..f58b296 100644
--- a/paludis/paludislike_options_conf.cc
+++ b/paludis/paludislike_options_conf.cc
@@ -66,17 +66,17 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct equals_value_name> equals_value;
-        typedef Name<struct locked_name> locked;
-        typedef Name<struct minus_name> minus;
-        typedef Name<struct minus_star_name> minus_star;
-        typedef Name<struct prefix_name> prefix;
-        typedef Name<struct set_name_name> set_name;
-        typedef Name<struct set_value_name> set_value;
-        typedef Name<struct spec_name> spec;
-        typedef Name<struct unprefixed_name_name> unprefixed_name;
-        typedef Name<struct values_name> values;
-        typedef Name<struct values_groups_name> values_groups;
+        typedef Name<struct name_equals_value> equals_value;
+        typedef Name<struct name_locked> locked;
+        typedef Name<struct name_minus> minus;
+        typedef Name<struct name_minus_star> minus_star;
+        typedef Name<struct name_prefix> prefix;
+        typedef Name<struct name_set_name> set_name;
+        typedef Name<struct name_set_value> set_value;
+        typedef Name<struct name_spec> spec;
+        typedef Name<struct name_unprefixed_name> unprefixed_name;
+        typedef Name<struct name_values> values;
+        typedef Name<struct name_values_groups> values_groups;
     }
 }
 
diff --git a/paludis/paludislike_options_conf.hh b/paludis/paludislike_options_conf.hh
index f2237cb..4dc2ec0 100644
--- a/paludis/paludislike_options_conf.hh
+++ b/paludis/paludislike_options_conf.hh
@@ -38,9 +38,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct allow_locking_name> allow_locking;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct make_config_file_name> make_config_file;
+        typedef Name<struct name_allow_locking> allow_locking;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_make_config_file> make_config_file;
     }
 
     /**
diff --git a/paludis/repositories/accounts/accounts_repository.hh b/paludis/repositories/accounts/accounts_repository.hh
index 36daeac..5dfac64 100644
--- a/paludis/repositories/accounts/accounts_repository.hh
+++ b/paludis/repositories/accounts/accounts_repository.hh
@@ -29,11 +29,11 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct handler_name> handler;
-        typedef Name<struct installed_name> installed;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_handler> handler;
+        typedef Name<struct name_installed> installed;
         typedef Name<struct name_name> name;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_root> root;
     }
 
     namespace accounts_repository
diff --git a/paludis/repositories/cran/cran_installed_repository.hh b/paludis/repositories/cran/cran_installed_repository.hh
index 2559862..1886bb4 100644
--- a/paludis/repositories/cran/cran_installed_repository.hh
+++ b/paludis/repositories/cran/cran_installed_repository.hh
@@ -36,9 +36,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct location_name> location;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_location> location;
+        typedef Name<struct name_root> root;
     }
 
     /**
diff --git a/paludis/repositories/cran/cran_repository.hh b/paludis/repositories/cran/cran_repository.hh
index acc7ec9..e7a4e16 100644
--- a/paludis/repositories/cran/cran_repository.hh
+++ b/paludis/repositories/cran/cran_repository.hh
@@ -39,13 +39,13 @@ namespace paludis
 
     namespace n
     {
-        typedef Name<struct builddir_name> builddir;
-        typedef Name<struct distdir_name> distdir;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct library_name> library;
-        typedef Name<struct location_name> location;
-        typedef Name<struct mirror_name> mirror;
-        typedef Name<struct sync_name> sync;
+        typedef Name<struct name_builddir> builddir;
+        typedef Name<struct name_distdir> distdir;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_library> library;
+        typedef Name<struct name_location> location;
+        typedef Name<struct name_mirror> mirror;
+        typedef Name<struct name_sync> sync;
     }
 
     /**
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index a589307..51b2aaa 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -63,8 +63,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct item_name> item;
-        typedef Name<struct spec_name> spec;
+        typedef Name<struct name_item> item;
+        typedef Name<struct name_spec> spec;
     }
 }
 
diff --git a/paludis/repositories/e/e_choices_key.cc b/paludis/repositories/e/e_choices_key.cc
index 023a79a..10da643 100644
--- a/paludis/repositories/e/e_choices_key.cc
+++ b/paludis/repositories/e/e_choices_key.cc
@@ -213,8 +213,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct default_value_name> default_value;
-        typedef Name<struct implicit_name> implicit;
+        typedef Name<struct name_default_value> default_value;
+        typedef Name<struct name_implicit> implicit;
     }
 }
 
diff --git a/paludis/repositories/e/e_installed_repository.hh b/paludis/repositories/e/e_installed_repository.hh
index 49a95ad..a0c4736 100644
--- a/paludis/repositories/e/e_installed_repository.hh
+++ b/paludis/repositories/e/e_installed_repository.hh
@@ -27,9 +27,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct builddir_name> builddir;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_builddir> builddir;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_root> root;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/e_repository_params.hh b/paludis/repositories/e/e_repository_params.hh
index 66c7b73..a5dc7de 100644
--- a/paludis/repositories/e/e_repository_params.hh
+++ b/paludis/repositories/e/e_repository_params.hh
@@ -41,37 +41,37 @@ namespace paludis
 
     namespace n
     {
-        typedef Name<struct append_repository_name_to_write_cache_name> append_repository_name_to_write_cache;
-        typedef Name<struct auto_profiles_name> auto_profiles;
-        typedef Name<struct binary_destination_name> binary_destination;
-        typedef Name<struct binary_distdir_name> binary_distdir;
-        typedef Name<struct binary_keywords_filter_name> binary_keywords_filter;
-        typedef Name<struct binary_uri_prefix_name> binary_uri_prefix;
-        typedef Name<struct builddir_name> builddir;
-        typedef Name<struct cache_name> cache;
-        typedef Name<struct distdir_name> distdir;
-        typedef Name<struct eapi_when_unknown_name> eapi_when_unknown;
-        typedef Name<struct eapi_when_unspecified_name> eapi_when_unspecified;
-        typedef Name<struct eclassdirs_name> eclassdirs;
-        typedef Name<struct entry_format_name> entry_format;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct ignore_deprecated_profiles_name> ignore_deprecated_profiles;
-        typedef Name<struct layout_name> layout;
-        typedef Name<struct location_name> location;
-        typedef Name<struct master_repositories_name> master_repositories;
-        typedef Name<struct names_cache_name> names_cache;
-        typedef Name<struct newsdir_name> newsdir;
-        typedef Name<struct profile_eapi_when_unspecified_name> profile_eapi_when_unspecified;
-        typedef Name<struct profile_layout_name> profile_layout;
-        typedef Name<struct profiles_name> profiles;
-        typedef Name<struct profiles_explicitly_set_name> profiles_explicitly_set;
-        typedef Name<struct securitydir_name> securitydir;
-        typedef Name<struct setsdir_name> setsdir;
-        typedef Name<struct sync_name> sync;
-        typedef Name<struct sync_options_name> sync_options;
-        typedef Name<struct use_manifest_name> use_manifest;
-        typedef Name<struct write_bin_uri_prefix_name> write_bin_uri_prefix;
-        typedef Name<struct write_cache_name> write_cache;
+        typedef Name<struct name_append_repository_name_to_write_cache> append_repository_name_to_write_cache;
+        typedef Name<struct name_auto_profiles> auto_profiles;
+        typedef Name<struct name_binary_destination> binary_destination;
+        typedef Name<struct name_binary_distdir> binary_distdir;
+        typedef Name<struct name_binary_keywords_filter> binary_keywords_filter;
+        typedef Name<struct name_binary_uri_prefix> binary_uri_prefix;
+        typedef Name<struct name_builddir> builddir;
+        typedef Name<struct name_cache> cache;
+        typedef Name<struct name_distdir> distdir;
+        typedef Name<struct name_eapi_when_unknown> eapi_when_unknown;
+        typedef Name<struct name_eapi_when_unspecified> eapi_when_unspecified;
+        typedef Name<struct name_eclassdirs> eclassdirs;
+        typedef Name<struct name_entry_format> entry_format;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_ignore_deprecated_profiles> ignore_deprecated_profiles;
+        typedef Name<struct name_layout> layout;
+        typedef Name<struct name_location> location;
+        typedef Name<struct name_master_repositories> master_repositories;
+        typedef Name<struct name_names_cache> names_cache;
+        typedef Name<struct name_newsdir> newsdir;
+        typedef Name<struct name_profile_eapi_when_unspecified> profile_eapi_when_unspecified;
+        typedef Name<struct name_profile_layout> profile_layout;
+        typedef Name<struct name_profiles> profiles;
+        typedef Name<struct name_profiles_explicitly_set> profiles_explicitly_set;
+        typedef Name<struct name_securitydir> securitydir;
+        typedef Name<struct name_setsdir> setsdir;
+        typedef Name<struct name_sync> sync;
+        typedef Name<struct name_sync_options> sync_options;
+        typedef Name<struct name_use_manifest> use_manifest;
+        typedef Name<struct name_write_bin_uri_prefix> write_bin_uri_prefix;
+        typedef Name<struct name_write_cache> write_cache;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/e_stripper.hh b/paludis/repositories/e/e_stripper.hh
index 36937ad..70924bb 100644
--- a/paludis/repositories/e/e_stripper.hh
+++ b/paludis/repositories/e/e_stripper.hh
@@ -29,12 +29,12 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct debug_dir_name> debug_dir;
-        typedef Name<struct image_dir_name> image_dir;
-        typedef Name<struct output_manager_name> output_manager;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct split_name> split;
-        typedef Name<struct strip_name> strip;
+        typedef Name<struct name_debug_dir> debug_dir;
+        typedef Name<struct name_image_dir> image_dir;
+        typedef Name<struct name_output_manager> output_manager;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_split> split;
+        typedef Name<struct name_strip> strip;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 65dfb9f..ae977fb 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -37,176 +37,176 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct annotations_name> annotations;
-        typedef Name<struct binary_from_env_variables_name> binary_from_env_variables;
-        typedef Name<struct blocker_resolution_name> blocker_resolution;
-        typedef Name<struct blocker_resolution_manual_name> blocker_resolution_manual;
-        typedef Name<struct blocker_resolution_uninstall_blocked_after_name> blocker_resolution_uninstall_blocked_after;
-        typedef Name<struct blocker_resolution_uninstall_blocked_before_name> blocker_resolution_uninstall_blocked_before;
-        typedef Name<struct blocker_resolution_upgrade_blocked_before_name> blocker_resolution_upgrade_blocked_before;
-        typedef Name<struct bracket_merged_variables_name> bracket_merged_variables;
-        typedef Name<struct bracket_merged_variables_annotatable_name> bracket_merged_variables_annotatable;
-        typedef Name<struct bracket_merged_variables_annotation_name> bracket_merged_variables_annotation;
-        typedef Name<struct breaks_portage_name> breaks_portage;
-        typedef Name<struct bugs_to_name> bugs_to;
-        typedef Name<struct build_depend_name> build_depend;
-        typedef Name<struct can_be_pbin_name> can_be_pbin;
-        typedef Name<struct choices_options_name> choices_options;
-        typedef Name<struct defined_phases_name> defined_phases;
-        typedef Name<struct dependencies_name> dependencies;
-        typedef Name<struct dependency_labels_name> dependency_labels;
-        typedef Name<struct dependency_spec_tree_parse_options_name> dependency_spec_tree_parse_options;
-        typedef Name<struct description_name> description;
-        typedef Name<struct description_choices_name> description_choices;
-        typedef Name<struct description_use_name> description_use;
-        typedef Name<struct directory_if_exists_variables_name> directory_if_exists_variables;
-        typedef Name<struct directory_variables_name> directory_variables;
-        typedef Name<struct dodoc_r_name> dodoc_r;
-        typedef Name<struct doins_symlink_name> doins_symlink;
-        typedef Name<struct doman_lang_filenames_name> doman_lang_filenames;
-        typedef Name<struct doman_lang_filenames_overrides_name> doman_lang_filenames_overrides;
-        typedef Name<struct dosym_mkdir_name> dosym_mkdir;
-        typedef Name<struct eapi_name> eapi;
-        typedef Name<struct ebuild_bad_options_name> ebuild_bad_options;
-        typedef Name<struct ebuild_config_name> ebuild_config;
-        typedef Name<struct ebuild_environment_variables_name> ebuild_environment_variables;
-        typedef Name<struct ebuild_fetch_extra_name> ebuild_fetch_extra;
-        typedef Name<struct ebuild_functions_name> ebuild_functions;
-        typedef Name<struct ebuild_info_name> ebuild_info;
-        typedef Name<struct ebuild_install_name> ebuild_install;
-        typedef Name<struct ebuild_metadata_name> ebuild_metadata;
-        typedef Name<struct ebuild_metadata_variables_name> ebuild_metadata_variables;
-        typedef Name<struct ebuild_module_suffixes_name> ebuild_module_suffixes;
-        typedef Name<struct ebuild_must_not_set_variables_name> ebuild_must_not_set_variables;
-        typedef Name<struct ebuild_nofetch_name> ebuild_nofetch;
-        typedef Name<struct ebuild_options_name> ebuild_options;
-        typedef Name<struct ebuild_phases_name> ebuild_phases;
-        typedef Name<struct ebuild_pretend_name> ebuild_pretend;
-        typedef Name<struct ebuild_uninstall_name> ebuild_uninstall;
-        typedef Name<struct ebuild_variable_name> ebuild_variable;
-        typedef Name<struct ebuild_new_upgrade_phase_order_name> ebuild_new_upgrade_phase_order;
-        typedef Name<struct econf_extra_options_name> econf_extra_options;
-        typedef Name<struct eclass_must_not_set_variables_name> eclass_must_not_set_variables;
-        typedef Name<struct env_a_name> env_a;
-        typedef Name<struct env_aa_name> env_aa;
-        typedef Name<struct env_accept_keywords_name> env_accept_keywords;
-        typedef Name<struct env_accept_license_name> env_accept_license;
-        typedef Name<struct env_arch_name> env_arch;
-        typedef Name<struct env_d_name> env_d;
-        typedef Name<struct env_distdir_name> env_distdir;
-        typedef Name<struct env_ebuild_phase_name> env_ebuild_phase;
-        typedef Name<struct env_ed_name> env_ed;
-        typedef Name<struct env_eprefix_name> env_eprefix;
-        typedef Name<struct env_eroot_name> env_eroot;
-        typedef Name<struct env_filesdir_name> env_filesdir;
-        typedef Name<struct env_iuse_implicit_name> env_iuse_implicit;
-        typedef Name<struct env_jobs_name> env_jobs;
-        typedef Name<struct env_kv_name> env_kv;
-        typedef Name<struct env_merge_type_name> env_merge_type;
-        typedef Name<struct env_p_name> env_p;
-        typedef Name<struct env_pf_name> env_pf;
-        typedef Name<struct env_portdir_name> env_portdir;
-        typedef Name<struct env_replaced_by_id_name> env_replaced_by_id;
-        typedef Name<struct env_replaced_by_version_name> env_replaced_by_version;
-        typedef Name<struct env_replacing_ids_name> env_replacing_ids;
-        typedef Name<struct env_replacing_versions_name> env_replacing_versions;
-        typedef Name<struct env_t_name> env_t;
-        typedef Name<struct env_use_name> env_use;
-        typedef Name<struct env_use_expand_name> env_use_expand;
-        typedef Name<struct env_use_expand_hidden_name> env_use_expand_hidden;
-        typedef Name<struct env_use_expand_implicit_name> env_use_expand_implicit;
-        typedef Name<struct env_use_expand_unprefixed_name> env_use_expand_unprefixed;
-        typedef Name<struct env_use_expand_values_part_name> env_use_expand_values_part;
-        typedef Name<struct exported_name_name> exported_name;
-        typedef Name<struct f_function_prefix_name> f_function_prefix;
-        typedef Name<struct failure_is_fatal_name> failure_is_fatal;
-        typedef Name<struct fancy_test_flag_name> fancy_test_flag;
-        typedef Name<struct fix_mtimes_name> fix_mtimes;
-        typedef Name<struct flat_list_index_name> flat_list_index;
-        typedef Name<struct general_description_name> general_description;
-        typedef Name<struct general_lang_name> general_lang;
-        typedef Name<struct general_note_name> general_note;
-        typedef Name<struct general_url_name> general_url;
-        typedef Name<struct generated_from_name> generated_from;
-        typedef Name<struct generated_time_name> generated_time;
-        typedef Name<struct generated_using_name> generated_using;
-        typedef Name<struct has_expensive_tests_name> has_expensive_tests;
-        typedef Name<struct has_optional_tests_name> has_optional_tests;
-        typedef Name<struct has_recommended_tests_name> has_recommended_tests;
-        typedef Name<struct homepage_name> homepage;
-        typedef Name<struct ignore_pivot_env_functions_name> ignore_pivot_env_functions;
-        typedef Name<struct ignore_pivot_env_variables_name> ignore_pivot_env_variables;
-        typedef Name<struct inherited_name> inherited;
-        typedef Name<struct is_pbin_name> is_pbin;
-        typedef Name<struct iuse_name> iuse;
-        typedef Name<struct iuse_effective_name> iuse_effective;
-        typedef Name<struct iuse_flag_parse_options_name> iuse_flag_parse_options;
-        typedef Name<struct keywords_name> keywords;
-        typedef Name<struct license_name> license;
-        typedef Name<struct load_modules_name> load_modules;
-        typedef Name<struct long_description_name> long_description;
-        typedef Name<struct merger_options_name> merger_options;
-        typedef Name<struct metadata_key_name> metadata_key;
-        typedef Name<struct minimum_flat_list_size_name> minimum_flat_list_size;
-        typedef Name<struct myoptions_name> myoptions;
-        typedef Name<struct myoptions_number_selected_name> myoptions_number_selected;
-        typedef Name<struct myoptions_number_selected_at_least_one_name> myoptions_number_selected_at_least_one;
-        typedef Name<struct myoptions_number_selected_at_most_one_name> myoptions_number_selected_at_most_one;
-        typedef Name<struct myoptions_number_selected_exactly_one_name> myoptions_number_selected_exactly_one;
-        typedef Name<struct myoptions_requires_name> myoptions_requires;
-        typedef Name<struct must_not_change_after_source_variables_name> must_not_change_after_source_variables;
-        typedef Name<struct must_not_change_variables_name> must_not_change_variables;
-        typedef Name<struct must_not_set_vars_starting_with_name> must_not_set_vars_starting_with;
+        typedef Name<struct name_annotations> annotations;
+        typedef Name<struct name_binary_from_env_variables> binary_from_env_variables;
+        typedef Name<struct name_blocker_resolution> blocker_resolution;
+        typedef Name<struct name_blocker_resolution_manual> blocker_resolution_manual;
+        typedef Name<struct name_blocker_resolution_uninstall_blocked_after> blocker_resolution_uninstall_blocked_after;
+        typedef Name<struct name_blocker_resolution_uninstall_blocked_before> blocker_resolution_uninstall_blocked_before;
+        typedef Name<struct name_blocker_resolution_upgrade_blocked_before> blocker_resolution_upgrade_blocked_before;
+        typedef Name<struct name_bracket_merged_variables> bracket_merged_variables;
+        typedef Name<struct name_bracket_merged_variables_annotatable> bracket_merged_variables_annotatable;
+        typedef Name<struct name_bracket_merged_variables_annotation> bracket_merged_variables_annotation;
+        typedef Name<struct name_breaks_portage> breaks_portage;
+        typedef Name<struct name_bugs_to> bugs_to;
+        typedef Name<struct name_build_depend> build_depend;
+        typedef Name<struct name_can_be_pbin> can_be_pbin;
+        typedef Name<struct name_choices_options> choices_options;
+        typedef Name<struct name_defined_phases> defined_phases;
+        typedef Name<struct name_dependencies> dependencies;
+        typedef Name<struct name_dependency_labels> dependency_labels;
+        typedef Name<struct name_dependency_spec_tree_parse_options> dependency_spec_tree_parse_options;
+        typedef Name<struct name_description> description;
+        typedef Name<struct name_description_choices> description_choices;
+        typedef Name<struct name_description_use> description_use;
+        typedef Name<struct name_directory_if_exists_variables> directory_if_exists_variables;
+        typedef Name<struct name_directory_variables> directory_variables;
+        typedef Name<struct name_dodoc_r> dodoc_r;
+        typedef Name<struct name_doins_symlink> doins_symlink;
+        typedef Name<struct name_doman_lang_filenames> doman_lang_filenames;
+        typedef Name<struct name_doman_lang_filenames_overrides> doman_lang_filenames_overrides;
+        typedef Name<struct name_dosym_mkdir> dosym_mkdir;
+        typedef Name<struct name_eapi> eapi;
+        typedef Name<struct name_ebuild_bad_options> ebuild_bad_options;
+        typedef Name<struct name_ebuild_config> ebuild_config;
+        typedef Name<struct name_ebuild_environment_variables> ebuild_environment_variables;
+        typedef Name<struct name_ebuild_fetch_extra> ebuild_fetch_extra;
+        typedef Name<struct name_ebuild_functions> ebuild_functions;
+        typedef Name<struct name_ebuild_info> ebuild_info;
+        typedef Name<struct name_ebuild_install> ebuild_install;
+        typedef Name<struct name_ebuild_metadata> ebuild_metadata;
+        typedef Name<struct name_ebuild_metadata_variables> ebuild_metadata_variables;
+        typedef Name<struct name_ebuild_module_suffixes> ebuild_module_suffixes;
+        typedef Name<struct name_ebuild_must_not_set_variables> ebuild_must_not_set_variables;
+        typedef Name<struct name_ebuild_nofetch> ebuild_nofetch;
+        typedef Name<struct name_ebuild_options> ebuild_options;
+        typedef Name<struct name_ebuild_phases> ebuild_phases;
+        typedef Name<struct name_ebuild_pretend> ebuild_pretend;
+        typedef Name<struct name_ebuild_uninstall> ebuild_uninstall;
+        typedef Name<struct name_ebuild_variable> ebuild_variable;
+        typedef Name<struct name_ebuild_new_upgrade_phase_order> ebuild_new_upgrade_phase_order;
+        typedef Name<struct name_econf_extra_options> econf_extra_options;
+        typedef Name<struct name_eclass_must_not_set_variables> eclass_must_not_set_variables;
+        typedef Name<struct name_env_a> env_a;
+        typedef Name<struct name_env_aa> env_aa;
+        typedef Name<struct name_env_accept_keywords> env_accept_keywords;
+        typedef Name<struct name_env_accept_license> env_accept_license;
+        typedef Name<struct name_env_arch> env_arch;
+        typedef Name<struct name_env_d> env_d;
+        typedef Name<struct name_env_distdir> env_distdir;
+        typedef Name<struct name_env_ebuild_phase> env_ebuild_phase;
+        typedef Name<struct name_env_ed> env_ed;
+        typedef Name<struct name_env_eprefix> env_eprefix;
+        typedef Name<struct name_env_eroot> env_eroot;
+        typedef Name<struct name_env_filesdir> env_filesdir;
+        typedef Name<struct name_env_iuse_implicit> env_iuse_implicit;
+        typedef Name<struct name_env_jobs> env_jobs;
+        typedef Name<struct name_env_kv> env_kv;
+        typedef Name<struct name_env_merge_type> env_merge_type;
+        typedef Name<struct name_env_p> env_p;
+        typedef Name<struct name_env_pf> env_pf;
+        typedef Name<struct name_env_portdir> env_portdir;
+        typedef Name<struct name_env_replaced_by_id> env_replaced_by_id;
+        typedef Name<struct name_env_replaced_by_version> env_replaced_by_version;
+        typedef Name<struct name_env_replacing_ids> env_replacing_ids;
+        typedef Name<struct name_env_replacing_versions> env_replacing_versions;
+        typedef Name<struct name_env_t> env_t;
+        typedef Name<struct name_env_use> env_use;
+        typedef Name<struct name_env_use_expand> env_use_expand;
+        typedef Name<struct name_env_use_expand_hidden> env_use_expand_hidden;
+        typedef Name<struct name_env_use_expand_implicit> env_use_expand_implicit;
+        typedef Name<struct name_env_use_expand_unprefixed> env_use_expand_unprefixed;
+        typedef Name<struct name_env_use_expand_values_part> env_use_expand_values_part;
+        typedef Name<struct name_exported_name> exported_name;
+        typedef Name<struct name_f_function_prefix> f_function_prefix;
+        typedef Name<struct name_failure_is_fatal> failure_is_fatal;
+        typedef Name<struct name_fancy_test_flag> fancy_test_flag;
+        typedef Name<struct name_fix_mtimes> fix_mtimes;
+        typedef Name<struct name_flat_list_index> flat_list_index;
+        typedef Name<struct name_general_description> general_description;
+        typedef Name<struct name_general_lang> general_lang;
+        typedef Name<struct name_general_note> general_note;
+        typedef Name<struct name_general_url> general_url;
+        typedef Name<struct name_generated_from> generated_from;
+        typedef Name<struct name_generated_time> generated_time;
+        typedef Name<struct name_generated_using> generated_using;
+        typedef Name<struct name_has_expensive_tests> has_expensive_tests;
+        typedef Name<struct name_has_optional_tests> has_optional_tests;
+        typedef Name<struct name_has_recommended_tests> has_recommended_tests;
+        typedef Name<struct name_homepage> homepage;
+        typedef Name<struct name_ignore_pivot_env_functions> ignore_pivot_env_functions;
+        typedef Name<struct name_ignore_pivot_env_variables> ignore_pivot_env_variables;
+        typedef Name<struct name_inherited> inherited;
+        typedef Name<struct name_is_pbin> is_pbin;
+        typedef Name<struct name_iuse> iuse;
+        typedef Name<struct name_iuse_effective> iuse_effective;
+        typedef Name<struct name_iuse_flag_parse_options> iuse_flag_parse_options;
+        typedef Name<struct name_keywords> keywords;
+        typedef Name<struct name_license> license;
+        typedef Name<struct name_load_modules> load_modules;
+        typedef Name<struct name_long_description> long_description;
+        typedef Name<struct name_merger_options> merger_options;
+        typedef Name<struct name_metadata_key> metadata_key;
+        typedef Name<struct name_minimum_flat_list_size> minimum_flat_list_size;
+        typedef Name<struct name_myoptions> myoptions;
+        typedef Name<struct name_myoptions_number_selected> myoptions_number_selected;
+        typedef Name<struct name_myoptions_number_selected_at_least_one> myoptions_number_selected_at_least_one;
+        typedef Name<struct name_myoptions_number_selected_at_most_one> myoptions_number_selected_at_most_one;
+        typedef Name<struct name_myoptions_number_selected_exactly_one> myoptions_number_selected_exactly_one;
+        typedef Name<struct name_myoptions_requires> myoptions_requires;
+        typedef Name<struct name_must_not_change_after_source_variables> must_not_change_after_source_variables;
+        typedef Name<struct name_must_not_change_variables> must_not_change_variables;
+        typedef Name<struct name_must_not_set_vars_starting_with> must_not_set_vars_starting_with;
         typedef Name<struct name_name> name;
-        typedef Name<struct no_s_workdir_fallback_name> no_s_workdir_fallback;
-        typedef Name<struct no_slot_or_repo_name> no_slot_or_repo;
-        typedef Name<struct non_empty_variables_name> non_empty_variables;
-        typedef Name<struct package_dep_spec_parse_options_name> package_dep_spec_parse_options;
-        typedef Name<struct pdepend_name> pdepend;
-        typedef Name<struct pipe_commands_name> pipe_commands;
-        typedef Name<struct profile_iuse_injection_name> profile_iuse_injection;
-        typedef Name<struct properties_name> properties;
-        typedef Name<struct provide_name> provide;
-        typedef Name<struct rdepend_defaults_to_depend_name> rdepend_defaults_to_depend;
-        typedef Name<struct remote_ids_name> remote_ids;
-        typedef Name<struct require_use_expand_in_iuse_name> require_use_expand_in_iuse;
-        typedef Name<struct required_use_name> required_use;
-        typedef Name<struct restrict_fetch_name> restrict_fetch;
-        typedef Name<struct restrict_mirror_name> restrict_mirror;
-        typedef Name<struct restrict_primaryuri_name> restrict_primaryuri;
-        typedef Name<struct restrictions_name> restrictions;
-        typedef Name<struct rewrite_virtuals_name> rewrite_virtuals;
-        typedef Name<struct run_depend_name> run_depend;
-        typedef Name<struct save_base_variables_name> save_base_variables;
-        typedef Name<struct save_unmodifiable_variables_name> save_unmodifiable_variables;
-        typedef Name<struct save_variables_name> save_variables;
-        typedef Name<struct shell_options_name> shell_options;
-        typedef Name<struct short_description_name> short_description;
-        typedef Name<struct slot_name> slot;
-        typedef Name<struct source_merged_variables_name> source_merged_variables;
-        typedef Name<struct src_uri_name> src_uri;
-        typedef Name<struct suggestions_group_name_name> suggestions_group_name;
-        typedef Name<struct support_eclasses_name> support_eclasses;
-        typedef Name<struct support_exlibs_name> support_exlibs;
-        typedef Name<struct supported_name> supported;
-        typedef Name<struct tools_options_name> tools_options;
-        typedef Name<struct unpack_fix_permissions_name> unpack_fix_permissions;
-        typedef Name<struct unpack_suffixes_name> unpack_suffixes;
-        typedef Name<struct unpack_unrecognised_is_fatal_name> unpack_unrecognised_is_fatal;
-        typedef Name<struct upstream_changelog_name> upstream_changelog;
-        typedef Name<struct upstream_documentation_name> upstream_documentation;
-        typedef Name<struct upstream_release_notes_name> upstream_release_notes;
-        typedef Name<struct uri_labels_name> uri_labels;
-        typedef Name<struct use_name> use;
-        typedef Name<struct use_expand_name> use_expand;
-        typedef Name<struct use_expand_hidden_name> use_expand_hidden;
-        typedef Name<struct use_expand_separator_name> use_expand_separator;
-        typedef Name<struct userpriv_cannot_use_root_name> userpriv_cannot_use_root;
-        typedef Name<struct utility_path_suffixes_name> utility_path_suffixes;
-        typedef Name<struct vdb_from_env_unless_empty_variables_name> vdb_from_env_unless_empty_variables;
-        typedef Name<struct vdb_from_env_variables_name> vdb_from_env_variables;
-        typedef Name<struct version_spec_options_name> version_spec_options;
-        typedef Name<struct want_portage_emulation_vars_name> want_portage_emulation_vars;
+        typedef Name<struct name_no_s_workdir_fallback> no_s_workdir_fallback;
+        typedef Name<struct name_no_slot_or_repo> no_slot_or_repo;
+        typedef Name<struct name_non_empty_variables> non_empty_variables;
+        typedef Name<struct name_package_dep_spec_parse_options> package_dep_spec_parse_options;
+        typedef Name<struct name_pdepend> pdepend;
+        typedef Name<struct name_pipe_commands> pipe_commands;
+        typedef Name<struct name_profile_iuse_injection> profile_iuse_injection;
+        typedef Name<struct name_properties> properties;
+        typedef Name<struct name_provide> provide;
+        typedef Name<struct name_rdepend_defaults_to_depend> rdepend_defaults_to_depend;
+        typedef Name<struct name_remote_ids> remote_ids;
+        typedef Name<struct name_require_use_expand_in_iuse> require_use_expand_in_iuse;
+        typedef Name<struct name_required_use> required_use;
+        typedef Name<struct name_restrict_fetch> restrict_fetch;
+        typedef Name<struct name_restrict_mirror> restrict_mirror;
+        typedef Name<struct name_restrict_primaryuri> restrict_primaryuri;
+        typedef Name<struct name_restrictions> restrictions;
+        typedef Name<struct name_rewrite_virtuals> rewrite_virtuals;
+        typedef Name<struct name_run_depend> run_depend;
+        typedef Name<struct name_save_base_variables> save_base_variables;
+        typedef Name<struct name_save_unmodifiable_variables> save_unmodifiable_variables;
+        typedef Name<struct name_save_variables> save_variables;
+        typedef Name<struct name_shell_options> shell_options;
+        typedef Name<struct name_short_description> short_description;
+        typedef Name<struct name_slot> slot;
+        typedef Name<struct name_source_merged_variables> source_merged_variables;
+        typedef Name<struct name_src_uri> src_uri;
+        typedef Name<struct name_suggestions_group_name> suggestions_group_name;
+        typedef Name<struct name_support_eclasses> support_eclasses;
+        typedef Name<struct name_support_exlibs> support_exlibs;
+        typedef Name<struct name_supported> supported;
+        typedef Name<struct name_tools_options> tools_options;
+        typedef Name<struct name_unpack_fix_permissions> unpack_fix_permissions;
+        typedef Name<struct name_unpack_suffixes> unpack_suffixes;
+        typedef Name<struct name_unpack_unrecognised_is_fatal> unpack_unrecognised_is_fatal;
+        typedef Name<struct name_upstream_changelog> upstream_changelog;
+        typedef Name<struct name_upstream_documentation> upstream_documentation;
+        typedef Name<struct name_upstream_release_notes> upstream_release_notes;
+        typedef Name<struct name_uri_labels> uri_labels;
+        typedef Name<struct name_use> use;
+        typedef Name<struct name_use_expand> use_expand;
+        typedef Name<struct name_use_expand_hidden> use_expand_hidden;
+        typedef Name<struct name_use_expand_separator> use_expand_separator;
+        typedef Name<struct name_userpriv_cannot_use_root> userpriv_cannot_use_root;
+        typedef Name<struct name_utility_path_suffixes> utility_path_suffixes;
+        typedef Name<struct name_vdb_from_env_unless_empty_variables> vdb_from_env_unless_empty_variables;
+        typedef Name<struct name_vdb_from_env_variables> vdb_from_env_variables;
+        typedef Name<struct name_version_spec_options> version_spec_options;
+        typedef Name<struct name_want_portage_emulation_vars> want_portage_emulation_vars;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/ebuild.hh b/paludis/repositories/e/ebuild.hh
index 9aa6a16..538399b 100644
--- a/paludis/repositories/e/ebuild.hh
+++ b/paludis/repositories/e/ebuild.hh
@@ -41,56 +41,56 @@ namespace paludis
 
     namespace n
     {
-        typedef Name<struct a_name> a;
-        typedef Name<struct aa_name> aa;
-        typedef Name<struct accept_license_name> accept_license;
-        typedef Name<struct binary_dist_base_name> binary_dist_base;
-        typedef Name<struct binary_distdir_name> binary_distdir;
-        typedef Name<struct binary_ebuild_location_name> binary_ebuild_location;
-        typedef Name<struct binary_keywords_name> binary_keywords;
-        typedef Name<struct binary_uri_extension_name> binary_uri_extension;
-        typedef Name<struct builddir_name> builddir;
-        typedef Name<struct clearenv_name> clearenv;
-        typedef Name<struct commands_name> commands;
-        typedef Name<struct config_protect_name> config_protect;
-        typedef Name<struct config_protect_mask_name> config_protect_mask;
-        typedef Name<struct destination_name> destination;
-        typedef Name<struct destination_repository_name> destination_repository;
-        typedef Name<struct distdir_name> distdir;
-        typedef Name<struct ebuild_dir_name> ebuild_dir;
-        typedef Name<struct ebuild_file_name> ebuild_file;
-        typedef Name<struct eclassdirs_name> eclassdirs;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct environment_file_name> environment_file;
-        typedef Name<struct exlibsdirs_name> exlibsdirs;
-        typedef Name<struct expand_vars_name> expand_vars;
-        typedef Name<struct files_dir_name> files_dir;
-        typedef Name<struct image_name> image;
-        typedef Name<struct info_vars_name> info_vars;
-        typedef Name<struct is_from_pbin_name> is_from_pbin;
-        typedef Name<struct load_environment_name> load_environment;
-        typedef Name<struct loadsaveenv_dir_name> loadsaveenv_dir;
-        typedef Name<struct maybe_output_manager_name> maybe_output_manager;
-        typedef Name<struct merger_options_name> merger_options;
-        typedef Name<struct output_directory_name> output_directory;
-        typedef Name<struct package_builddir_name> package_builddir;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct portdir_name> portdir;
-        typedef Name<struct profiles_name> profiles;
-        typedef Name<struct profiles_with_parents_name> profiles_with_parents;
-        typedef Name<struct replaced_by_name> replaced_by;
-        typedef Name<struct replacing_ids_name> replacing_ids;
-        typedef Name<struct root_name> root;
-        typedef Name<struct sandbox_name> sandbox;
-        typedef Name<struct sydbox_name> sydbox;
-        typedef Name<struct slot_name> slot;
-        typedef Name<struct unmerge_only_name> unmerge_only;
-        typedef Name<struct unmet_requirements_name> unmet_requirements;
-        typedef Name<struct use_name> use;
-        typedef Name<struct use_ebuild_file_name> use_ebuild_file;
-        typedef Name<struct use_expand_name> use_expand;
-        typedef Name<struct use_expand_hidden_name> use_expand_hidden;
-        typedef Name<struct userpriv_name> userpriv;
+        typedef Name<struct name_a> a;
+        typedef Name<struct name_aa> aa;
+        typedef Name<struct name_accept_license> accept_license;
+        typedef Name<struct name_binary_dist_base> binary_dist_base;
+        typedef Name<struct name_binary_distdir> binary_distdir;
+        typedef Name<struct name_binary_ebuild_location> binary_ebuild_location;
+        typedef Name<struct name_binary_keywords> binary_keywords;
+        typedef Name<struct name_binary_uri_extension> binary_uri_extension;
+        typedef Name<struct name_builddir> builddir;
+        typedef Name<struct name_clearenv> clearenv;
+        typedef Name<struct name_commands> commands;
+        typedef Name<struct name_config_protect> config_protect;
+        typedef Name<struct name_config_protect_mask> config_protect_mask;
+        typedef Name<struct name_destination> destination;
+        typedef Name<struct name_destination_repository> destination_repository;
+        typedef Name<struct name_distdir> distdir;
+        typedef Name<struct name_ebuild_dir> ebuild_dir;
+        typedef Name<struct name_ebuild_file> ebuild_file;
+        typedef Name<struct name_eclassdirs> eclassdirs;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_environment_file> environment_file;
+        typedef Name<struct name_exlibsdirs> exlibsdirs;
+        typedef Name<struct name_expand_vars> expand_vars;
+        typedef Name<struct name_files_dir> files_dir;
+        typedef Name<struct name_image> image;
+        typedef Name<struct name_info_vars> info_vars;
+        typedef Name<struct name_is_from_pbin> is_from_pbin;
+        typedef Name<struct name_load_environment> load_environment;
+        typedef Name<struct name_loadsaveenv_dir> loadsaveenv_dir;
+        typedef Name<struct name_maybe_output_manager> maybe_output_manager;
+        typedef Name<struct name_merger_options> merger_options;
+        typedef Name<struct name_output_directory> output_directory;
+        typedef Name<struct name_package_builddir> package_builddir;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_portdir> portdir;
+        typedef Name<struct name_profiles> profiles;
+        typedef Name<struct name_profiles_with_parents> profiles_with_parents;
+        typedef Name<struct name_replaced_by> replaced_by;
+        typedef Name<struct name_replacing_ids> replacing_ids;
+        typedef Name<struct name_root> root;
+        typedef Name<struct name_sandbox> sandbox;
+        typedef Name<struct name_sydbox> sydbox;
+        typedef Name<struct name_slot> slot;
+        typedef Name<struct name_unmerge_only> unmerge_only;
+        typedef Name<struct name_unmet_requirements> unmet_requirements;
+        typedef Name<struct name_use> use;
+        typedef Name<struct name_use_ebuild_file> use_ebuild_file;
+        typedef Name<struct name_use_expand> use_expand;
+        typedef Name<struct name_use_expand_hidden> use_expand_hidden;
+        typedef Name<struct name_userpriv> userpriv;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/exndbam_repository.hh b/paludis/repositories/e/exndbam_repository.hh
index 0c6fbb7..4467bb6 100644
--- a/paludis/repositories/e/exndbam_repository.hh
+++ b/paludis/repositories/e/exndbam_repository.hh
@@ -31,11 +31,11 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct builddir_name> builddir;
-        typedef Name<struct eapi_when_unknown_name> eapi_when_unknown;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct location_name> location;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_builddir> builddir;
+        typedef Name<struct name_eapi_when_unknown> eapi_when_unknown;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_location> location;
+        typedef Name<struct name_root> root;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/extra_distribution_data.hh b/paludis/repositories/e/extra_distribution_data.hh
index 7188635..85aad1f 100644
--- a/paludis/repositories/e/extra_distribution_data.hh
+++ b/paludis/repositories/e/extra_distribution_data.hh
@@ -31,23 +31,23 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct default_buildroot_name> default_buildroot;
-        typedef Name<struct default_distdir_name> default_distdir;
-        typedef Name<struct default_eapi_when_unknown_name> default_eapi_when_unknown;
-        typedef Name<struct default_eapi_when_unspecified_name> default_eapi_when_unspecified;
-        typedef Name<struct default_layout_name> default_layout;
-        typedef Name<struct default_names_cache_name> default_names_cache;
-        typedef Name<struct default_profile_eapi_name> default_profile_eapi;
-        typedef Name<struct default_profile_layout_name> default_profile_layout;
-        typedef Name<struct default_provides_cache_name> default_provides_cache;
-        typedef Name<struct default_write_cache_name> default_write_cache;
-        typedef Name<struct news_directory_name> news_directory;
-        typedef Name<struct qa_category_dir_checks_name> qa_category_dir_checks;
-        typedef Name<struct qa_eclass_file_contents_checks_name> qa_eclass_file_contents_checks;
-        typedef Name<struct qa_package_dir_checks_name> qa_package_dir_checks;
-        typedef Name<struct qa_package_id_checks_name> qa_package_id_checks;
-        typedef Name<struct qa_package_id_file_contents_checks_name> qa_package_id_file_contents_checks;
-        typedef Name<struct qa_tree_checks_name> qa_tree_checks;
+        typedef Name<struct name_default_buildroot> default_buildroot;
+        typedef Name<struct name_default_distdir> default_distdir;
+        typedef Name<struct name_default_eapi_when_unknown> default_eapi_when_unknown;
+        typedef Name<struct name_default_eapi_when_unspecified> default_eapi_when_unspecified;
+        typedef Name<struct name_default_layout> default_layout;
+        typedef Name<struct name_default_names_cache> default_names_cache;
+        typedef Name<struct name_default_profile_eapi> default_profile_eapi;
+        typedef Name<struct name_default_profile_layout> default_profile_layout;
+        typedef Name<struct name_default_provides_cache> default_provides_cache;
+        typedef Name<struct name_default_write_cache> default_write_cache;
+        typedef Name<struct name_news_directory> news_directory;
+        typedef Name<struct name_qa_category_dir_checks> qa_category_dir_checks;
+        typedef Name<struct name_qa_eclass_file_contents_checks> qa_eclass_file_contents_checks;
+        typedef Name<struct name_qa_package_dir_checks> qa_package_dir_checks;
+        typedef Name<struct name_qa_package_id_checks> qa_package_id_checks;
+        typedef Name<struct name_qa_package_id_file_contents_checks> qa_package_id_file_contents_checks;
+        typedef Name<struct name_qa_tree_checks> qa_tree_checks;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/glsa.hh b/paludis/repositories/e/glsa.hh
index 6d45170..7dac38c 100644
--- a/paludis/repositories/e/glsa.hh
+++ b/paludis/repositories/e/glsa.hh
@@ -32,9 +32,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct op_name> op;
-        typedef Name<struct slot_name> slot;
-        typedef Name<struct version_name> version;
+        typedef Name<struct name_op> op;
+        typedef Name<struct name_slot> slot;
+        typedef Name<struct name_version> version;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/manifest2_reader.hh b/paludis/repositories/e/manifest2_reader.hh
index f228f14..2d362a5 100644
--- a/paludis/repositories/e/manifest2_reader.hh
+++ b/paludis/repositories/e/manifest2_reader.hh
@@ -35,13 +35,13 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct md5_name> md5;
+        typedef Name<struct name_md5> md5;
         typedef Name<struct name_name> name;
-        typedef Name<struct rmd160_name> rmd160;
-        typedef Name<struct sha1_name> sha1;
-        typedef Name<struct sha256_name> sha256;
-        typedef Name<struct size_name> size;
-        typedef Name<struct type_name> type;
+        typedef Name<struct name_rmd160> rmd160;
+        typedef Name<struct name_sha1> sha1;
+        typedef Name<struct name_sha256> sha256;
+        typedef Name<struct name_size> size;
+        typedef Name<struct name_type> type;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/metadata_xml.hh b/paludis/repositories/e/metadata_xml.hh
index 7e0e99a..3792024 100644
--- a/paludis/repositories/e/metadata_xml.hh
+++ b/paludis/repositories/e/metadata_xml.hh
@@ -34,10 +34,10 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct herds_name> herds;
-        typedef Name<struct long_description_name> long_description;
-        typedef Name<struct maintainers_name> maintainers;
-        typedef Name<struct uses_name> uses;
+        typedef Name<struct name_herds> herds;
+        typedef Name<struct name_long_description> long_description;
+        typedef Name<struct name_maintainers> maintainers;
+        typedef Name<struct name_uses> uses;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/pbin_merger.hh b/paludis/repositories/e/pbin_merger.hh
index 5b3620a..ccd3e37 100644
--- a/paludis/repositories/e/pbin_merger.hh
+++ b/paludis/repositories/e/pbin_merger.hh
@@ -30,17 +30,17 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct environment_file_name> environment_file;
-        typedef Name<struct fix_mtimes_before_name> fix_mtimes_before;
-        typedef Name<struct image_name> image;
-        typedef Name<struct install_under_name> install_under;
-        typedef Name<struct merged_entries_name> merged_entries;
-        typedef Name<struct options_name> options;
-        typedef Name<struct output_manager_name> output_manager;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct root_name> root;
-        typedef Name<struct tar_file_name> tar_file;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_environment_file> environment_file;
+        typedef Name<struct name_fix_mtimes_before> fix_mtimes_before;
+        typedef Name<struct name_image> image;
+        typedef Name<struct name_install_under> install_under;
+        typedef Name<struct name_merged_entries> merged_entries;
+        typedef Name<struct name_options> options;
+        typedef Name<struct name_output_manager> output_manager;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_root> root;
+        typedef Name<struct name_tar_file> tar_file;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh
index d76a33e..57ad1fd 100644
--- a/paludis/repositories/e/vdb_merger.hh
+++ b/paludis/repositories/e/vdb_merger.hh
@@ -31,16 +31,16 @@ namespace paludis
 
     namespace n
     {
-        typedef Name<struct config_protect_name> config_protect;
-        typedef Name<struct config_protect_mask_name> config_protect_mask;
-        typedef Name<struct contents_file_name> contents_file;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct image_name> image;
-        typedef Name<struct merged_entries_name> merged_entries;
-        typedef Name<struct options_name> options;
-        typedef Name<struct output_manager_name> output_manager;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_config_protect> config_protect;
+        typedef Name<struct name_config_protect_mask> config_protect_mask;
+        typedef Name<struct name_contents_file> contents_file;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_image> image;
+        typedef Name<struct name_merged_entries> merged_entries;
+        typedef Name<struct name_options> options;
+        typedef Name<struct name_output_manager> output_manager;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_root> root;
     }
 
     /**
diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh
index 56b02f3..fba4b08 100644
--- a/paludis/repositories/e/vdb_repository.hh
+++ b/paludis/repositories/e/vdb_repository.hh
@@ -39,14 +39,14 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct builddir_name> builddir;
-        typedef Name<struct eapi_when_unknown_name> eapi_when_unknown;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct location_name> location;
+        typedef Name<struct name_builddir> builddir;
+        typedef Name<struct name_eapi_when_unknown> eapi_when_unknown;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_location> location;
         typedef Name<struct name_name> name;
-        typedef Name<struct names_cache_name> names_cache;
-        typedef Name<struct provides_cache_name> provides_cache;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_names_cache> names_cache;
+        typedef Name<struct name_provides_cache> provides_cache;
+        typedef Name<struct name_root> root;
     }
 
     namespace erepository
diff --git a/paludis/repositories/e/vdb_unmerger.hh b/paludis/repositories/e/vdb_unmerger.hh
index a336b8c..8fdd83a 100644
--- a/paludis/repositories/e/vdb_unmerger.hh
+++ b/paludis/repositories/e/vdb_unmerger.hh
@@ -31,13 +31,13 @@ namespace paludis
 
     namespace n
     {
-        typedef Name<struct config_protect_name> config_protect;
-        typedef Name<struct config_protect_mask_name> config_protect_mask;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct ignore_name> ignore;
-        typedef Name<struct output_manager_name> output_manager;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_config_protect> config_protect;
+        typedef Name<struct name_config_protect_mask> config_protect_mask;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_ignore> ignore;
+        typedef Name<struct name_output_manager> output_manager;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_root> root;
     }
 
     /**
diff --git a/paludis/repositories/fake/fake_installed_repository.hh b/paludis/repositories/fake/fake_installed_repository.hh
index 9bce539..d9ab2a6 100644
--- a/paludis/repositories/fake/fake_installed_repository.hh
+++ b/paludis/repositories/fake/fake_installed_repository.hh
@@ -26,10 +26,10 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
+        typedef Name<struct name_environment> environment;
         typedef Name<struct name_name> name;
-        typedef Name<struct suitable_destination_name> suitable_destination;
-        typedef Name<struct supports_uninstall_name> supports_uninstall;
+        typedef Name<struct name_suitable_destination> suitable_destination;
+        typedef Name<struct name_supports_uninstall> supports_uninstall;
     }
 
     /**
diff --git a/paludis/repositories/fake/fake_repository.hh b/paludis/repositories/fake/fake_repository.hh
index 19c224e..543427a 100644
--- a/paludis/repositories/fake/fake_repository.hh
+++ b/paludis/repositories/fake/fake_repository.hh
@@ -27,7 +27,7 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
+        typedef Name<struct name_environment> environment;
         typedef Name<struct name_name> name;
     }
 
diff --git a/paludis/repositories/gemcutter/gemcutter_id.hh b/paludis/repositories/gemcutter/gemcutter_id.hh
index a118756..8fbde3e 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.hh
+++ b/paludis/repositories/gemcutter/gemcutter_id.hh
@@ -31,9 +31,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct info_name> info;
-        typedef Name<struct repository_name> repository;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_info> info;
+        typedef Name<struct name_repository> repository;
     }
 
     namespace gemcutter_repository
diff --git a/paludis/repositories/gemcutter/gemcutter_repository.hh b/paludis/repositories/gemcutter/gemcutter_repository.hh
index 78b0557..ec9e541 100644
--- a/paludis/repositories/gemcutter/gemcutter_repository.hh
+++ b/paludis/repositories/gemcutter/gemcutter_repository.hh
@@ -30,8 +30,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct location_name> location;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_location> location;
         typedef Name<struct name_name> name;
     }
 
diff --git a/paludis/repositories/gemcutter/json_common.hh b/paludis/repositories/gemcutter/json_common.hh
index 9cf45e7..5b3eaa7 100644
--- a/paludis/repositories/gemcutter/json_common.hh
+++ b/paludis/repositories/gemcutter/json_common.hh
@@ -30,22 +30,22 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct authors_name> authors;
-        typedef Name<struct bug_tracker_uri_name> bug_tracker_uri;
-        typedef Name<struct dependencies_name> dependencies;
-        typedef Name<struct development_dependencies_name> development_dependencies;
-        typedef Name<struct documentation_uri_name> documentation_uri;
-        typedef Name<struct gem_uri_name> gem_uri;
-        typedef Name<struct homepage_uri_name> homepage_uri;
-        typedef Name<struct info_name> info;
-        typedef Name<struct mailing_list_uri_name> mailing_list_uri;
+        typedef Name<struct name_authors> authors;
+        typedef Name<struct name_bug_tracker_uri> bug_tracker_uri;
+        typedef Name<struct name_dependencies> dependencies;
+        typedef Name<struct name_development_dependencies> development_dependencies;
+        typedef Name<struct name_documentation_uri> documentation_uri;
+        typedef Name<struct name_gem_uri> gem_uri;
+        typedef Name<struct name_homepage_uri> homepage_uri;
+        typedef Name<struct name_info> info;
+        typedef Name<struct name_mailing_list_uri> mailing_list_uri;
         typedef Name<struct name_name> name;
-        typedef Name<struct project_uri_name> project_uri;
-        typedef Name<struct requirements_name> requirements;
-        typedef Name<struct runtime_dependencies_name> runtime_dependencies;
-        typedef Name<struct source_code_uri_name> source_code_uri;
-        typedef Name<struct version_name> version;
-        typedef Name<struct wiki_uri_name> wiki_uri;
+        typedef Name<struct name_project_uri> project_uri;
+        typedef Name<struct name_requirements> requirements;
+        typedef Name<struct name_runtime_dependencies> runtime_dependencies;
+        typedef Name<struct name_source_code_uri> source_code_uri;
+        typedef Name<struct name_version> version;
+        typedef Name<struct name_wiki_uri> wiki_uri;
     }
 
     namespace gemcutter_repository
diff --git a/paludis/repositories/repository/repository_id.hh b/paludis/repositories/repository/repository_id.hh
index 1c3ab82..0538357 100644
--- a/paludis/repositories/repository/repository_id.hh
+++ b/paludis/repositories/repository/repository_id.hh
@@ -29,9 +29,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
+        typedef Name<struct name_environment> environment;
         typedef Name<struct name_name> name;
-        typedef Name<struct repository_name> repository;
+        typedef Name<struct name_repository> repository;
     }
 
     namespace repository_repository
diff --git a/paludis/repositories/repository/repository_repository.hh b/paludis/repositories/repository/repository_repository.hh
index 577a7bf..b65fe21 100644
--- a/paludis/repositories/repository/repository_repository.hh
+++ b/paludis/repositories/repository/repository_repository.hh
@@ -29,11 +29,11 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct config_filename_name> config_filename;
-        typedef Name<struct config_template_name> config_template;
-        typedef Name<struct environment_name> environment;
+        typedef Name<struct name_config_filename> config_filename;
+        typedef Name<struct name_config_template> config_template;
+        typedef Name<struct name_environment> environment;
         typedef Name<struct name_name> name;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_root> root;
     }
 
     namespace repository_repository
diff --git a/paludis/repositories/unavailable/unavailable_package_id.hh b/paludis/repositories/unavailable/unavailable_package_id.hh
index 0bfabc6..a9f9918 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.hh
+++ b/paludis/repositories/unavailable/unavailable_package_id.hh
@@ -29,16 +29,16 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct description_name> description;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct from_repositories_name> from_repositories;
-        typedef Name<struct mask_name> mask;
+        typedef Name<struct name_description> description;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_from_repositories> from_repositories;
+        typedef Name<struct name_mask> mask;
         typedef Name<struct name_name> name;
-        typedef Name<struct repository_name> repository;
-        typedef Name<struct repository_description_name> repository_description;
-        typedef Name<struct repository_homepage_name> repository_homepage;
-        typedef Name<struct slot_name> slot;
-        typedef Name<struct version_name> version;
+        typedef Name<struct name_repository> repository;
+        typedef Name<struct name_repository_description> repository_description;
+        typedef Name<struct name_repository_homepage> repository_homepage;
+        typedef Name<struct name_slot> slot;
+        typedef Name<struct name_version> version;
     }
 
     namespace unavailable_repository
diff --git a/paludis/repositories/unavailable/unavailable_repository.hh b/paludis/repositories/unavailable/unavailable_repository.hh
index a0c18dd..1284c7f 100644
--- a/paludis/repositories/unavailable/unavailable_repository.hh
+++ b/paludis/repositories/unavailable/unavailable_repository.hh
@@ -29,11 +29,11 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct location_name> location;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_location> location;
         typedef Name<struct name_name> name;
-        typedef Name<struct sync_name> sync;
-        typedef Name<struct sync_options_name> sync_options;
+        typedef Name<struct name_sync> sync;
+        typedef Name<struct name_sync_options> sync_options;
     }
 
     namespace unavailable_repository
diff --git a/paludis/repositories/unavailable/unavailable_repository_file-fwd.hh b/paludis/repositories/unavailable/unavailable_repository_file-fwd.hh
index db4391b..c266895 100644
--- a/paludis/repositories/unavailable/unavailable_repository_file-fwd.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_file-fwd.hh
@@ -31,10 +31,10 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct description_name> description;
+        typedef Name<struct name_description> description;
         typedef Name<struct name_name> name;
-        typedef Name<struct slot_name> slot;
-        typedef Name<struct version_name> version;
+        typedef Name<struct name_slot> slot;
+        typedef Name<struct name_version> version;
     }
 
     namespace unavailable_repository
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.hh b/paludis/repositories/unavailable/unavailable_repository_id.hh
index 9b35cd4..041fabd 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_id.hh
@@ -30,15 +30,15 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct dependencies_name> dependencies;
-        typedef Name<struct description_name> description;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct format_name> format;
-        typedef Name<struct homepage_name> homepage;
-        typedef Name<struct mask_name> mask;
+        typedef Name<struct name_dependencies> dependencies;
+        typedef Name<struct name_description> description;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_format> format;
+        typedef Name<struct name_homepage> homepage;
+        typedef Name<struct name_mask> mask;
         typedef Name<struct name_name> name;
-        typedef Name<struct repository_name> repository;
-        typedef Name<struct sync_name> sync;
+        typedef Name<struct name_repository> repository;
+        typedef Name<struct name_sync> sync;
     }
 
     namespace unavailable_repository
diff --git a/paludis/repositories/unpackaged/installed_repository.hh b/paludis/repositories/unpackaged/installed_repository.hh
index 948e8e9..2ca0b94 100644
--- a/paludis/repositories/unpackaged/installed_repository.hh
+++ b/paludis/repositories/unpackaged/installed_repository.hh
@@ -29,9 +29,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct location_name> location;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_location> location;
+        typedef Name<struct name_root> root;
     }
 
     namespace unpackaged_repositories
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.hh b/paludis/repositories/unpackaged/unpackaged_repository.hh
index 14bd983..8e3a799 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.hh
+++ b/paludis/repositories/unpackaged/unpackaged_repository.hh
@@ -29,18 +29,18 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct build_dependencies_name> build_dependencies;
-        typedef Name<struct description_name> description;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct install_under_name> install_under;
-        typedef Name<struct location_name> location;
+        typedef Name<struct name_build_dependencies> build_dependencies;
+        typedef Name<struct name_description> description;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_install_under> install_under;
+        typedef Name<struct name_location> location;
         typedef Name<struct name_name> name;
-        typedef Name<struct preserve_work_name> preserve_work;
-        typedef Name<struct rewrite_ids_over_to_root_name> rewrite_ids_over_to_root;
-        typedef Name<struct run_dependencies_name> run_dependencies;
-        typedef Name<struct slot_name> slot;
-        typedef Name<struct strip_name> strip;
-        typedef Name<struct version_name> version;
+        typedef Name<struct name_preserve_work> preserve_work;
+        typedef Name<struct name_rewrite_ids_over_to_root> rewrite_ids_over_to_root;
+        typedef Name<struct name_run_dependencies> run_dependencies;
+        typedef Name<struct name_slot> slot;
+        typedef Name<struct name_strip> strip;
+        typedef Name<struct name_version> version;
     }
 
     namespace unpackaged_repositories
diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.hh b/paludis/repositories/unpackaged/unpackaged_stripper.hh
index 51b1924..6d38dc7 100644
--- a/paludis/repositories/unpackaged/unpackaged_stripper.hh
+++ b/paludis/repositories/unpackaged/unpackaged_stripper.hh
@@ -29,12 +29,12 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct debug_dir_name> debug_dir;
-        typedef Name<struct image_dir_name> image_dir;
-        typedef Name<struct output_manager_name> output_manager;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct split_name> split;
-        typedef Name<struct strip_name> strip;
+        typedef Name<struct name_debug_dir> debug_dir;
+        typedef Name<struct name_image_dir> image_dir;
+        typedef Name<struct name_output_manager> output_manager;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_split> split;
+        typedef Name<struct name_strip> strip;
     }
 
     namespace unpackaged_repositories
diff --git a/paludis/repositories/unwritten/unwritten_id.hh b/paludis/repositories/unwritten/unwritten_id.hh
index 9cc15e5..abef3be 100644
--- a/paludis/repositories/unwritten/unwritten_id.hh
+++ b/paludis/repositories/unwritten/unwritten_id.hh
@@ -29,21 +29,21 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct added_by_name> added_by;
-        typedef Name<struct bug_ids_name> bug_ids;
-        typedef Name<struct comment_name> comment;
-        typedef Name<struct commit_id_name> commit_id;
-        typedef Name<struct description_name> description;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct homepage_name> homepage;
-        typedef Name<struct mask_name> mask;
+        typedef Name<struct name_added_by> added_by;
+        typedef Name<struct name_bug_ids> bug_ids;
+        typedef Name<struct name_comment> comment;
+        typedef Name<struct name_commit_id> commit_id;
+        typedef Name<struct name_description> description;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_homepage> homepage;
+        typedef Name<struct name_mask> mask;
         typedef Name<struct name_name> name;
-        typedef Name<struct remote_ids_name> remote_ids;
-        typedef Name<struct removed_by_name> removed_by;
-        typedef Name<struct removed_from_name> removed_from;
-        typedef Name<struct repository_name> repository;
-        typedef Name<struct slot_name> slot;
-        typedef Name<struct version_name> version;
+        typedef Name<struct name_remote_ids> remote_ids;
+        typedef Name<struct name_removed_by> removed_by;
+        typedef Name<struct name_removed_from> removed_from;
+        typedef Name<struct name_repository> repository;
+        typedef Name<struct name_slot> slot;
+        typedef Name<struct name_version> version;
     }
 
     namespace unwritten_repository
diff --git a/paludis/repositories/unwritten/unwritten_repository.hh b/paludis/repositories/unwritten/unwritten_repository.hh
index 5adf816..ec3ffb7 100644
--- a/paludis/repositories/unwritten/unwritten_repository.hh
+++ b/paludis/repositories/unwritten/unwritten_repository.hh
@@ -28,11 +28,11 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct location_name> location;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_location> location;
         typedef Name<struct name_name> name;
-        typedef Name<struct sync_name> sync;
-        typedef Name<struct sync_options_name> sync_options;
+        typedef Name<struct name_sync> sync;
+        typedef Name<struct name_sync_options> sync_options;
     }
 
     namespace unwritten_repository
diff --git a/paludis/repositories/unwritten/unwritten_repository_file.hh b/paludis/repositories/unwritten/unwritten_repository_file.hh
index b206c87..6156744 100644
--- a/paludis/repositories/unwritten/unwritten_repository_file.hh
+++ b/paludis/repositories/unwritten/unwritten_repository_file.hh
@@ -33,18 +33,18 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct added_by_name> added_by;
-        typedef Name<struct bug_ids_name> bug_ids;
-        typedef Name<struct comment_name> comment;
-        typedef Name<struct commit_id_name> commit_id;
-        typedef Name<struct description_name> description;
-        typedef Name<struct homepage_name> homepage;
+        typedef Name<struct name_added_by> added_by;
+        typedef Name<struct name_bug_ids> bug_ids;
+        typedef Name<struct name_comment> comment;
+        typedef Name<struct name_commit_id> commit_id;
+        typedef Name<struct name_description> description;
+        typedef Name<struct name_homepage> homepage;
         typedef Name<struct name_name> name;
-        typedef Name<struct remote_ids_name> remote_ids;
-        typedef Name<struct removed_by_name> removed_by;
-        typedef Name<struct removed_from_name> removed_from;
-        typedef Name<struct slot_name> slot;
-        typedef Name<struct version_name> version;
+        typedef Name<struct name_remote_ids> remote_ids;
+        typedef Name<struct name_removed_by> removed_by;
+        typedef Name<struct name_removed_from> removed_from;
+        typedef Name<struct name_slot> slot;
+        typedef Name<struct name_version> version;
     }
 
     namespace unwritten_repository
diff --git a/paludis/repositories/unwritten/unwritten_repository_store.hh b/paludis/repositories/unwritten/unwritten_repository_store.hh
index 766ee94..ad1b630 100644
--- a/paludis/repositories/unwritten/unwritten_repository_store.hh
+++ b/paludis/repositories/unwritten/unwritten_repository_store.hh
@@ -32,9 +32,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct entry_suffix_name> entry_suffix;
+        typedef Name<struct name_entry_suffix> entry_suffix;
         typedef Name<struct name_name> name;
-        typedef Name<struct role_name> role;
+        typedef Name<struct name_role> role;
     }
 
     namespace unwritten_repository
diff --git a/paludis/repository.cc b/paludis/repository.cc
index 91ee1af..5142eaf 100644
--- a/paludis/repository.cc
+++ b/paludis/repository.cc
@@ -79,7 +79,7 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct repository_blacklist_name> repository_blacklist;
+        typedef Name<struct name_repository_blacklist> repository_blacklist;
     }
 }
 
diff --git a/paludis/repository.hh b/paludis/repository.hh
index 4e46252..9d1e543 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -58,29 +58,29 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct arch_name> arch;
-        typedef Name<struct build_start_time_name> build_start_time;
-        typedef Name<struct destination_interface_name> destination_interface;
-        typedef Name<struct environment_file_name> environment_file;
-        typedef Name<struct environment_variable_interface_name> environment_variable_interface;
-        typedef Name<struct image_dir_name> image_dir;
-        typedef Name<struct make_virtuals_interface_name> make_virtuals_interface;
-        typedef Name<struct manifest_interface_name> manifest_interface;
-        typedef Name<struct merged_entries_name> merged_entries;
-        typedef Name<struct options_name> options;
-        typedef Name<struct output_manager_name> output_manager;
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct path_name> path;
-        typedef Name<struct perform_uninstall_name> perform_uninstall;
-        typedef Name<struct profile_name> profile;
-        typedef Name<struct provided_by_name> provided_by;
-        typedef Name<struct provided_by_spec_name> provided_by_spec;
-        typedef Name<struct provides_interface_name> provides_interface;
-        typedef Name<struct replacing_name> replacing;
-        typedef Name<struct status_name> status;
-        typedef Name<struct used_this_for_config_protect_name> used_this_for_config_protect;
-        typedef Name<struct virtual_name_name> virtual_name;
-        typedef Name<struct virtuals_interface_name> virtuals_interface;
+        typedef Name<struct name_arch> arch;
+        typedef Name<struct name_build_start_time> build_start_time;
+        typedef Name<struct name_destination_interface> destination_interface;
+        typedef Name<struct name_environment_file> environment_file;
+        typedef Name<struct name_environment_variable_interface> environment_variable_interface;
+        typedef Name<struct name_image_dir> image_dir;
+        typedef Name<struct name_make_virtuals_interface> make_virtuals_interface;
+        typedef Name<struct name_manifest_interface> manifest_interface;
+        typedef Name<struct name_merged_entries> merged_entries;
+        typedef Name<struct name_options> options;
+        typedef Name<struct name_output_manager> output_manager;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_path> path;
+        typedef Name<struct name_perform_uninstall> perform_uninstall;
+        typedef Name<struct name_profile> profile;
+        typedef Name<struct name_provided_by> provided_by;
+        typedef Name<struct name_provided_by_spec> provided_by_spec;
+        typedef Name<struct name_provides_interface> provides_interface;
+        typedef Name<struct name_replacing> replacing;
+        typedef Name<struct name_status> status;
+        typedef Name<struct name_used_this_for_config_protect> used_this_for_config_protect;
+        typedef Name<struct name_virtual_name> virtual_name;
+        typedef Name<struct name_virtuals_interface> virtuals_interface;
     }
 
     /**
diff --git a/paludis/repository_factory.cc b/paludis/repository_factory.cc
index 3746ed9..6a5681d 100644
--- a/paludis/repository_factory.cc
+++ b/paludis/repository_factory.cc
@@ -40,10 +40,10 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct create_function_name> create_function;
-        typedef Name<struct dependencies_function_name> dependencies_function;
-        typedef Name<struct importance_function_name> importance_function;
-        typedef Name<struct name_function_name> name_function;
+        typedef Name<struct name_create_function> create_function;
+        typedef Name<struct name_dependencies_function> dependencies_function;
+        typedef Name<struct name_importance_function> importance_function;
+        typedef Name<struct name_name_function> name_function;
     }
 }
 
diff --git a/paludis/resolver/change_by_resolvent.hh b/paludis/resolver/change_by_resolvent.hh
index 6871ad5..1371db1 100644
--- a/paludis/resolver/change_by_resolvent.hh
+++ b/paludis/resolver/change_by_resolvent.hh
@@ -32,8 +32,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct resolvent_name> resolvent;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_resolvent> resolvent;
     }
 
     namespace resolver
diff --git a/paludis/resolver/constraint.hh b/paludis/resolver/constraint.hh
index e7a97e4..0e1aed4 100644
--- a/paludis/resolver/constraint.hh
+++ b/paludis/resolver/constraint.hh
@@ -35,13 +35,13 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct destination_type_name> destination_type;
-        typedef Name<struct force_unable_name> force_unable;
-        typedef Name<struct nothing_is_fine_too_name> nothing_is_fine_too;
-        typedef Name<struct reason_name> reason;
-        typedef Name<struct spec_name> spec;
-        typedef Name<struct untaken_name> untaken;
-        typedef Name<struct use_existing_name> use_existing;
+        typedef Name<struct name_destination_type> destination_type;
+        typedef Name<struct name_force_unable> force_unable;
+        typedef Name<struct name_nothing_is_fine_too> nothing_is_fine_too;
+        typedef Name<struct name_reason> reason;
+        typedef Name<struct name_spec> spec;
+        typedef Name<struct name_untaken> untaken;
+        typedef Name<struct name_use_existing> use_existing;
     }
 
     namespace resolver
diff --git a/paludis/resolver/destination.hh b/paludis/resolver/destination.hh
index fa6647d..dc8a7fa 100644
--- a/paludis/resolver/destination.hh
+++ b/paludis/resolver/destination.hh
@@ -32,8 +32,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct replacing_name> replacing;
-        typedef Name<struct repository_name> repository;
+        typedef Name<struct name_replacing> replacing;
+        typedef Name<struct name_repository> repository;
     }
 
     namespace resolver
diff --git a/paludis/resolver/job_lists.hh b/paludis/resolver/job_lists.hh
index 4901b4b..e108b70 100644
--- a/paludis/resolver/job_lists.hh
+++ b/paludis/resolver/job_lists.hh
@@ -31,8 +31,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct execute_job_list_name> execute_job_list;
-        typedef Name<struct pretend_job_list_name> pretend_job_list;
+        typedef Name<struct name_execute_job_list> execute_job_list;
+        typedef Name<struct name_pretend_job_list> pretend_job_list;
     }
 
     namespace resolver
diff --git a/paludis/resolver/job_requirements.hh b/paludis/resolver/job_requirements.hh
index 114f051..9e47b6a 100644
--- a/paludis/resolver/job_requirements.hh
+++ b/paludis/resolver/job_requirements.hh
@@ -32,8 +32,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct job_number_name> job_number;
-        typedef Name<struct required_if_name> required_if;
+        typedef Name<struct name_job_number> job_number;
+        typedef Name<struct name_required_if> required_if;
     }
 
     namespace resolver
diff --git a/paludis/resolver/nag.cc b/paludis/resolver/nag.cc
index f4dffcd..6c1237a 100644
--- a/paludis/resolver/nag.cc
+++ b/paludis/resolver/nag.cc
@@ -102,8 +102,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct index_name> index;
-        typedef Name<struct lowlink_name> lowlink;
+        typedef Name<struct name_index> index;
+        typedef Name<struct name_lowlink> lowlink;
     }
 
     template <>
diff --git a/paludis/resolver/nag.hh b/paludis/resolver/nag.hh
index 9dc0729..6664266 100644
--- a/paludis/resolver/nag.hh
+++ b/paludis/resolver/nag.hh
@@ -34,13 +34,13 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct always_name> always;
-        typedef Name<struct build_name> build;
-        typedef Name<struct build_all_met_name> build_all_met;
-        typedef Name<struct resolvent_name> resolvent;
-        typedef Name<struct role_name> role;
-        typedef Name<struct run_name> run;
-        typedef Name<struct run_all_met_name> run_all_met;
+        typedef Name<struct name_always> always;
+        typedef Name<struct name_build> build;
+        typedef Name<struct name_build_all_met> build_all_met;
+        typedef Name<struct name_resolvent> resolvent;
+        typedef Name<struct name_role> role;
+        typedef Name<struct name_run> run;
+        typedef Name<struct name_run_all_met> run_all_met;
     }
 
     namespace resolver
diff --git a/paludis/resolver/orderer_notes.hh b/paludis/resolver/orderer_notes.hh
index 91367b2..794f367 100644
--- a/paludis/resolver/orderer_notes.hh
+++ b/paludis/resolver/orderer_notes.hh
@@ -30,7 +30,7 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct cycle_breaking_name> cycle_breaking;
+        typedef Name<struct name_cycle_breaking> cycle_breaking;
     }
 
     namespace resolver
diff --git a/paludis/resolver/package_or_block_dep_spec.hh b/paludis/resolver/package_or_block_dep_spec.hh
index c71ba1a..459a2a8 100644
--- a/paludis/resolver/package_or_block_dep_spec.hh
+++ b/paludis/resolver/package_or_block_dep_spec.hh
@@ -29,8 +29,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct if_package_name> if_package;
-        typedef Name<struct if_block_name> if_block;
+        typedef Name<struct name_if_package> if_package;
+        typedef Name<struct name_if_block> if_block;
     }
 
     namespace resolver
diff --git a/paludis/resolver/resolution.hh b/paludis/resolver/resolution.hh
index 87a16d2..cd87a5d 100644
--- a/paludis/resolver/resolution.hh
+++ b/paludis/resolver/resolution.hh
@@ -31,9 +31,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct constraints_name> constraints;
-        typedef Name<struct decision_name> decision;
-        typedef Name<struct resolvent_name> resolvent;
+        typedef Name<struct name_constraints> constraints;
+        typedef Name<struct name_decision> decision;
+        typedef Name<struct name_resolvent> resolvent;
     }
 
     namespace resolver
diff --git a/paludis/resolver/resolved.hh b/paludis/resolver/resolved.hh
index ac523d0..e5f8fd4 100644
--- a/paludis/resolver/resolved.hh
+++ b/paludis/resolver/resolved.hh
@@ -34,15 +34,15 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct job_lists_name> job_lists;
-        typedef Name<struct nag_name> nag;
-        typedef Name<struct resolutions_by_resolvent_name> resolutions_by_resolvent;
-        typedef Name<struct taken_change_or_remove_decisions_name> taken_change_or_remove_decisions;
-        typedef Name<struct taken_unable_to_make_decisions_name> taken_unable_to_make_decisions;
-        typedef Name<struct taken_unconfirmed_decisions_name> taken_unconfirmed_decisions;
-        typedef Name<struct taken_unorderable_decisions_name> taken_unorderable_decisions;
-        typedef Name<struct untaken_change_or_remove_decisions_name> untaken_change_or_remove_decisions;
-        typedef Name<struct untaken_unable_to_make_decisions_name> untaken_unable_to_make_decisions;
+        typedef Name<struct name_job_lists> job_lists;
+        typedef Name<struct name_nag> nag;
+        typedef Name<struct name_resolutions_by_resolvent> resolutions_by_resolvent;
+        typedef Name<struct name_taken_change_or_remove_decisions> taken_change_or_remove_decisions;
+        typedef Name<struct name_taken_unable_to_make_decisions> taken_unable_to_make_decisions;
+        typedef Name<struct name_taken_unconfirmed_decisions> taken_unconfirmed_decisions;
+        typedef Name<struct name_taken_unorderable_decisions> taken_unorderable_decisions;
+        typedef Name<struct name_untaken_change_or_remove_decisions> untaken_change_or_remove_decisions;
+        typedef Name<struct name_untaken_unable_to_make_decisions> untaken_unable_to_make_decisions;
     }
 
     namespace resolver
diff --git a/paludis/resolver/resolvent.hh b/paludis/resolver/resolvent.hh
index 4ab1b6e..57f98ae 100644
--- a/paludis/resolver/resolvent.hh
+++ b/paludis/resolver/resolvent.hh
@@ -36,9 +36,9 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct destination_type_name> destination_type;
-        typedef Name<struct package_name> package;
-        typedef Name<struct slot_name> slot;
+        typedef Name<struct name_destination_type> destination_type;
+        typedef Name<struct name_package> package;
+        typedef Name<struct name_slot> slot;
     }
 
     namespace resolver
diff --git a/paludis/resolver/resolver_functions.hh b/paludis/resolver/resolver_functions.hh
index d05280e..4074599 100644
--- a/paludis/resolver/resolver_functions.hh
+++ b/paludis/resolver/resolver_functions.hh
@@ -46,28 +46,28 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct allow_choice_changes_fn_name> allow_choice_changes_fn;
-        typedef Name<struct allowed_to_remove_fn_name> allowed_to_remove_fn;
-        typedef Name<struct always_via_binary_fn_name> always_via_binary_fn;
-        typedef Name<struct can_use_fn_name> can_use_fn;
-        typedef Name<struct confirm_fn_name> confirm_fn;
-        typedef Name<struct find_replacing_fn_name> find_replacing_fn;
-        typedef Name<struct find_repository_for_fn_name> find_repository_for_fn;
-        typedef Name<struct get_constraints_for_dependent_fn_name> get_constraints_for_dependent_fn;
-        typedef Name<struct get_constraints_for_purge_fn_name> get_constraints_for_purge_fn;
-        typedef Name<struct get_constraints_for_via_binary_fn_name> get_constraints_for_via_binary_fn;
-        typedef Name<struct get_destination_types_for_blocker_fn_name> get_destination_types_for_blocker_fn;
-        typedef Name<struct get_destination_types_for_error_fn_name> get_destination_types_for_error_fn;
-        typedef Name<struct get_initial_constraints_for_fn_name> get_initial_constraints_for_fn;
-        typedef Name<struct get_resolvents_for_fn_name> get_resolvents_for_fn;
-        typedef Name<struct get_use_existing_nothing_fn_name> get_use_existing_nothing_fn;
-        typedef Name<struct interest_in_spec_fn_name> interest_in_spec_fn;
-        typedef Name<struct make_destination_filtered_generator_fn_name> make_destination_filtered_generator_fn;
-        typedef Name<struct make_origin_filtered_generator_fn_name> make_origin_filtered_generator_fn;
-        typedef Name<struct make_unmaskable_filter_fn_name> make_unmaskable_filter_fn;
-        typedef Name<struct order_early_fn_name> order_early_fn;
-        typedef Name<struct prefer_or_avoid_fn_name> prefer_or_avoid_fn;
-        typedef Name<struct remove_if_dependent_fn_name> remove_if_dependent_fn;
+        typedef Name<struct name_allow_choice_changes_fn> allow_choice_changes_fn;
+        typedef Name<struct name_allowed_to_remove_fn> allowed_to_remove_fn;
+        typedef Name<struct name_always_via_binary_fn> always_via_binary_fn;
+        typedef Name<struct name_can_use_fn> can_use_fn;
+        typedef Name<struct name_confirm_fn> confirm_fn;
+        typedef Name<struct name_find_replacing_fn> find_replacing_fn;
+        typedef Name<struct name_find_repository_for_fn> find_repository_for_fn;
+        typedef Name<struct name_get_constraints_for_dependent_fn> get_constraints_for_dependent_fn;
+        typedef Name<struct name_get_constraints_for_purge_fn> get_constraints_for_purge_fn;
+        typedef Name<struct name_get_constraints_for_via_binary_fn> get_constraints_for_via_binary_fn;
+        typedef Name<struct name_get_destination_types_for_blocker_fn> get_destination_types_for_blocker_fn;
+        typedef Name<struct name_get_destination_types_for_error_fn> get_destination_types_for_error_fn;
+        typedef Name<struct name_get_initial_constraints_for_fn> get_initial_constraints_for_fn;
+        typedef Name<struct name_get_resolvents_for_fn> get_resolvents_for_fn;
+        typedef Name<struct name_get_use_existing_nothing_fn> get_use_existing_nothing_fn;
+        typedef Name<struct name_interest_in_spec_fn> interest_in_spec_fn;
+        typedef Name<struct name_make_destination_filtered_generator_fn> make_destination_filtered_generator_fn;
+        typedef Name<struct name_make_origin_filtered_generator_fn> make_origin_filtered_generator_fn;
+        typedef Name<struct name_make_unmaskable_filter_fn> make_unmaskable_filter_fn;
+        typedef Name<struct name_order_early_fn> order_early_fn;
+        typedef Name<struct name_prefer_or_avoid_fn> prefer_or_avoid_fn;
+        typedef Name<struct name_remove_if_dependent_fn> remove_if_dependent_fn;
     }
 
     namespace resolver
diff --git a/paludis/resolver/sanitised_dependencies.hh b/paludis/resolver/sanitised_dependencies.hh
index 12e7c77..cbfa4e0 100644
--- a/paludis/resolver/sanitised_dependencies.hh
+++ b/paludis/resolver/sanitised_dependencies.hh
@@ -36,14 +36,14 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct active_conditions_as_string_name> active_conditions_as_string;
-        typedef Name<struct active_dependency_labels_name> active_dependency_labels;
-        typedef Name<struct active_dependency_labels_as_string_name> active_dependency_labels_as_string;
-        typedef Name<struct active_dependency_labels_classifier_name> active_dependency_labels_classifier;
-        typedef Name<struct metadata_key_human_name_name> metadata_key_human_name;
-        typedef Name<struct metadata_key_raw_name_name> metadata_key_raw_name;
-        typedef Name<struct original_specs_as_string_name> original_specs_as_string;
-        typedef Name<struct spec_name> spec;
+        typedef Name<struct name_active_conditions_as_string> active_conditions_as_string;
+        typedef Name<struct name_active_dependency_labels> active_dependency_labels;
+        typedef Name<struct name_active_dependency_labels_as_string> active_dependency_labels_as_string;
+        typedef Name<struct name_active_dependency_labels_classifier> active_dependency_labels_classifier;
+        typedef Name<struct name_metadata_key_human_name> metadata_key_human_name;
+        typedef Name<struct name_metadata_key_raw_name> metadata_key_raw_name;
+        typedef Name<struct name_original_specs_as_string> original_specs_as_string;
+        typedef Name<struct name_spec> spec;
     }
 
     namespace resolver
diff --git a/paludis/resolver/slot_name_or_null.hh b/paludis/resolver/slot_name_or_null.hh
index 9d8bbae..b9f76e7 100644
--- a/paludis/resolver/slot_name_or_null.hh
+++ b/paludis/resolver/slot_name_or_null.hh
@@ -29,8 +29,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct name_or_null_name> name_or_null;
-        typedef Name<struct null_means_unknown_name> null_means_unknown;
+        typedef Name<struct name_name_or_null> name_or_null;
+        typedef Name<struct name_null_means_unknown> null_means_unknown;
     }
 
     namespace resolver
diff --git a/paludis/resolver/spec_rewriter.hh b/paludis/resolver/spec_rewriter.hh
index 075cdea..3846caa 100644
--- a/paludis/resolver/spec_rewriter.hh
+++ b/paludis/resolver/spec_rewriter.hh
@@ -36,7 +36,7 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct specs_name> specs;
+        typedef Name<struct name_specs> specs;
     }
 
     namespace resolver
diff --git a/paludis/resolver/strongly_connected_component.hh b/paludis/resolver/strongly_connected_component.hh
index 817c4a4..28d3894 100644
--- a/paludis/resolver/strongly_connected_component.hh
+++ b/paludis/resolver/strongly_connected_component.hh
@@ -34,8 +34,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct nodes_name> nodes;
-        typedef Name<struct requirements_name> requirements;
+        typedef Name<struct name_nodes> nodes;
+        typedef Name<struct name_requirements> requirements;
     }
 
     namespace resolver
diff --git a/paludis/resolver/unsuitable_candidates.hh b/paludis/resolver/unsuitable_candidates.hh
index 25b0512..8de3f8f 100644
--- a/paludis/resolver/unsuitable_candidates.hh
+++ b/paludis/resolver/unsuitable_candidates.hh
@@ -30,8 +30,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct package_id_name> package_id;
-        typedef Name<struct unmet_constraints_name> unmet_constraints;
+        typedef Name<struct name_package_id> package_id;
+        typedef Name<struct name_unmet_constraints> unmet_constraints;
     }
 
     namespace resolver
diff --git a/paludis/resolver/why_changed_choices.hh b/paludis/resolver/why_changed_choices.hh
index e1ceebd..7a9934f 100644
--- a/paludis/resolver/why_changed_choices.hh
+++ b/paludis/resolver/why_changed_choices.hh
@@ -30,8 +30,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct changed_choices_name> changed_choices;
-        typedef Name<struct reasons_name> reasons;
+        typedef Name<struct name_changed_choices> changed_choices;
+        typedef Name<struct name_reasons> reasons;
     }
 
     namespace resolver
diff --git a/paludis/set_file.hh b/paludis/set_file.hh
index 78d18bb..e8554de 100644
--- a/paludis/set_file.hh
+++ b/paludis/set_file.hh
@@ -52,12 +52,12 @@ namespace paludis
 
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct file_name_name> file_name;
-        typedef Name<struct parser_name> parser;
-        typedef Name<struct set_operator_mode_name> set_operator_mode;
-        typedef Name<struct tag_name> tag;
-        typedef Name<struct type_name> type;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_file_name> file_name;
+        typedef Name<struct name_parser> parser;
+        typedef Name<struct name_set_operator_mode> set_operator_mode;
+        typedef Name<struct name_tag> tag;
+        typedef Name<struct name_type> type;
     }
 
     /**
diff --git a/paludis/stripper.hh b/paludis/stripper.hh
index ca1d904..711ccc8 100644
--- a/paludis/stripper.hh
+++ b/paludis/stripper.hh
@@ -32,10 +32,10 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct debug_dir_name> debug_dir;
-        typedef Name<struct image_dir_name> image_dir;
-        typedef Name<struct split_name> split;
-        typedef Name<struct strip_name> strip;
+        typedef Name<struct name_debug_dir> debug_dir;
+        typedef Name<struct name_image_dir> image_dir;
+        typedef Name<struct name_split> split;
+        typedef Name<struct name_strip> strip;
     }
 
     struct StripperOptions
diff --git a/paludis/syncer.hh b/paludis/syncer.hh
index 5b9f8c3..d06e8e4 100644
--- a/paludis/syncer.hh
+++ b/paludis/syncer.hh
@@ -40,12 +40,12 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct filter_file_name> filter_file;
-        typedef Name<struct local_name> local;
-        typedef Name<struct options_name> options;
-        typedef Name<struct output_manager_name> output_manager;
-        typedef Name<struct remote_name> remote;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_filter_file> filter_file;
+        typedef Name<struct name_local> local;
+        typedef Name<struct name_options> options;
+        typedef Name<struct name_output_manager> output_manager;
+        typedef Name<struct name_remote> remote;
     }
 
     /**
diff --git a/paludis/tar_merger.hh b/paludis/tar_merger.hh
index 302eee9..dc7fb9d 100644
--- a/paludis/tar_merger.hh
+++ b/paludis/tar_merger.hh
@@ -28,18 +28,18 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct compression_name> compression;
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct fix_mtimes_before_name> fix_mtimes_before;
-        typedef Name<struct get_new_ids_or_minus_one_name> get_new_ids_or_minus_one;
-        typedef Name<struct image_name> image;
-        typedef Name<struct install_under_name> install_under;
-        typedef Name<struct maybe_output_manager_name> maybe_output_manager;
-        typedef Name<struct merged_entries_name> merged_entries;
-        typedef Name<struct no_chown_name> no_chown;
-        typedef Name<struct options_name> options;
-        typedef Name<struct root_name> root;
-        typedef Name<struct tar_file_name> tar_file;
+        typedef Name<struct name_compression> compression;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_fix_mtimes_before> fix_mtimes_before;
+        typedef Name<struct name_get_new_ids_or_minus_one> get_new_ids_or_minus_one;
+        typedef Name<struct name_image> image;
+        typedef Name<struct name_install_under> install_under;
+        typedef Name<struct name_maybe_output_manager> maybe_output_manager;
+        typedef Name<struct name_merged_entries> merged_entries;
+        typedef Name<struct name_no_chown> no_chown;
+        typedef Name<struct name_options> options;
+        typedef Name<struct name_root> root;
+        typedef Name<struct name_tar_file> tar_file;
     }
 
     /**
diff --git a/paludis/unmerger.hh b/paludis/unmerger.hh
index e71f2cd..4a8068d 100644
--- a/paludis/unmerger.hh
+++ b/paludis/unmerger.hh
@@ -48,10 +48,10 @@ namespace paludis
 
     namespace n
     {
-        typedef Name<struct environment_name> environment;
-        typedef Name<struct ignore_name> ignore;
-        typedef Name<struct maybe_output_manager_name> maybe_output_manager;
-        typedef Name<struct root_name> root;
+        typedef Name<struct name_environment> environment;
+        typedef Name<struct name_ignore> ignore;
+        typedef Name<struct name_maybe_output_manager> maybe_output_manager;
+        typedef Name<struct name_root> root;
     }
 
     /**
diff --git a/paludis/version_requirements.hh b/paludis/version_requirements.hh
index ca03639..380adc0 100644
--- a/paludis/version_requirements.hh
+++ b/paludis/version_requirements.hh
@@ -39,8 +39,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct version_operator_name> version_operator;
-        typedef Name<struct version_spec_name> version_spec;
+        typedef Name<struct name_version_operator> version_operator;
+        typedef Name<struct name_version_spec> version_spec;
     }
 
     /**
diff --git a/paludis/version_spec.hh b/paludis/version_spec.hh
index 446fc89..4f0edd4 100644
--- a/paludis/version_spec.hh
+++ b/paludis/version_spec.hh
@@ -64,9 +64,9 @@ namespace paludis
 
     namespace n
     {
-        typedef Name<struct number_value_name> number_value;
-        typedef Name<struct text_name> text;
-        typedef Name<struct type_name> type;
+        typedef Name<struct name_number_value> number_value;
+        typedef Name<struct name_text> text;
+        typedef Name<struct name_type> type;
     }
 
     /**
diff --git a/src/clients/adjutrix/find_dropped_keywords.cc b/src/clients/adjutrix/find_dropped_keywords.cc
index e16c3e0..53322da 100644
--- a/src/clients/adjutrix/find_dropped_keywords.cc
+++ b/src/clients/adjutrix/find_dropped_keywords.cc
@@ -48,8 +48,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct best_anywhere_name> best_anywhere;
-        typedef Name<struct best_keyworded_name> best_keyworded;
+        typedef Name<struct name_best_anywhere> best_anywhere;
+        typedef Name<struct name_best_keyworded> best_keyworded;
     }
 }
 
diff --git a/src/clients/adjutrix/find_stable_candidates.cc b/src/clients/adjutrix/find_stable_candidates.cc
index 346c582..99742ed 100644
--- a/src/clients/adjutrix/find_stable_candidates.cc
+++ b/src/clients/adjutrix/find_stable_candidates.cc
@@ -50,8 +50,8 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct best_version_name> best_version;
-        typedef Name<struct our_version_name> our_version;
+        typedef Name<struct name_best_version> best_version;
+        typedef Name<struct name_our_version> our_version;
     }
 }
 
diff --git a/src/clients/cave/resume_data.hh b/src/clients/cave/resume_data.hh
index ab7cde5..6275b33 100644
--- a/src/clients/cave/resume_data.hh
+++ b/src/clients/cave/resume_data.hh
@@ -30,12 +30,12 @@ namespace paludis
 {
     namespace n
     {
-        typedef Name<struct job_lists_name> job_lists;
-        typedef Name<struct preserve_world_name> preserve_world;
-        typedef Name<struct removed_if_dependent_names_name> removed_if_dependent_names;
-        typedef Name<struct target_set_name> target_set;
-        typedef Name<struct targets_name> targets;
-        typedef Name<struct world_specs_name> world_specs;
+        typedef Name<struct name_job_lists> job_lists;
+        typedef Name<struct name_preserve_world> preserve_world;
+        typedef Name<struct name_removed_if_dependent_names> removed_if_dependent_names;
+        typedef Name<struct name_target_set> target_set;
+        typedef Name<struct name_targets> targets;
+        typedef Name<struct name_world_specs> world_specs;
     }
 
     namespace cave