Cleaned up prefixed names mapping