Make command line flag conform with naming scheme