Added rename logic
Attempted to fix issues but not sticking