Remove name collision in 2.x