Second part of the rename task