Merge "Add name mapping for base64"