revised some mappings and aliases