Rename and enhance command