Refactored Names, Skip Mapping Value Whitespace