Rename commands to commandhandling