Resolve more naming conflicts with RK2.0