Merge "Remove JSON from class name"