rename commands and fix iterator