Changed classes names to avoid conflict with base classes.