Rename locale and command_line to display and dispatch.