add conflicting names support for @evan