Remove 2 from class names to prevent namespace ambiguity.