Fix conflicting names