diff --git a/VBoxManage b/VBoxManage
index af5a31c..cad4a12 100644
--- a/VBoxManage
+++ b/VBoxManage
@@ -601,8 +601,8 @@ _VBoxManage() {
                 _vms_comp vms
             else
                 _find_item_name 2
-                items=(--snapshot --mode --options --name --groups --basefolder
-                --uuid --register --snapshot)
+                items=( --basefolder --groups --mode --name --options --register
+                    --snapshot --uuid )
                 _get_excluded_items "${items[@]}"
                 COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
                 case "${prev}" in
@@ -615,8 +615,8 @@ _VBoxManage() {
                         all" -- ${cur}) )
                         ;;
                     --options)
-                        COMPREPLY=( $(compgen -W "link keepallmacs keepnatmacs
-                        keepdisknames keephwuuids" -- ${cur}) )
+                        COMPREPLY=( $(compgen -W "Link KeepAllMACs KeepNATMACs
+                            KeepDiskNames KeepHwUUIDs" -- ${cur}) )
                         ;;
                     --groups)
                         COMPREPLY=()