refactoring
renamed class to resolve name conflict