Refactored class names to avoid conflict with other plugins