Rename command ids to the unified form