Fixing conflict names