Rename some command names