Resolve class name conflict, closing #1119