Minor nomenclature changes and command list update