Add rename command
Merge ChatMaster