Rename commands to improve consistency.