also new saint mode stuff on rename
Merge pull request #157 from pantheon-systems/fix-retry

also new saint mode stuff on rename