Starting to implement entry rename