Feature #2746: Fix rename input. Refactor code to use common method
Feature #2746: In rename, update .die & .live to .off & .on