Rename to increase name unicity