Added allow for rename to false