Cleanup code name. Restored _all in mapping.