You guys want to make all commands consistent in current sprint or next sprint? If it were next sprint, let's make the changes as little as possible for now, and send out another pull request to reach the consistent goal during the next sprint.