fix conflicting names.