Name mapping
More principal/name rewriting support