changed class names to avoid future conflict