Tool rename
Fix handling long