Request name performance improvements. Removed some defensive code in mappings.