changed class names to avoid conflicts