Refactored class names to avoid naming conflicts