diff --git a/README.md b/README.md
index d878499d745c1abf66b110eee5ca4b85ef84b4d5..eac81030fb15315f290a98b1c26c8cfc2ef97018 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # has and hac - hpssadm wrapper
 
-'hac and has' are developed by MAX PLANCK COMPUTING AND DATA FACILITY and published under GNU GENERAL PUBLIC LICENSE Version 3.
+'hac and has' is developed by MAX PLANCK COMPUTING AND DATA FACILITY and published under GNU GENERAL PUBLIC LICENSE Version 3.
 For questions and suggestions please contact Elena Summer elena.summer (at) mpcdf.mpg.de
 
 'hac and has' is a client-server application. 
@@ -13,27 +13,33 @@ Try it first on a test system to be sure it behaves appropriately.
 
 ## Installation ##
 
-Copy 'hac', 'has' and 'hac.dict' in a directory which should be in PATH, for example /usr/local/bin/.
+'has' and 'hac' are installed and used only on the machine where HPSS is running - HPSS core machine. 'has' accepts connections only from localhost.
 
-Create a 'has' systemctl service. Start 'has' with 'systemctl start has'. Then use 'hac' commands. See 'hac help' for details.
+'has' should run under the Linux user which can run 'hpssadm'.
 
-systemctl service is used by 'hac' to restart 'has' if it is not running. Therefore, you should either create the 'has' systemctl service or change 'hac' code to not use it. If you don't use a 'has' systemctl service, you can start 'has' by just typing "has" in terminal.
+'hac' can run under any Linux user registered on the HPSS core machine. 'hac' executable should be in this user's PATH environmental variable. 'hac.log' should be accessible for this user to write. This means that any user who can login to HPSS core machine, can run 'hac' commands and change anything in HPSS. If you do not want any user to run 'hac', you can make 'hac' executable not accessible for this user. Or you can implement a more fine grained user management in 'has' and 'hac'.
 
-'hac' and 'has' log files as well as hac.dict are located in the same directory where the executables - 'hac' and 'has' - reside . Please change the code to use different directories.
+To install 'has' and 'hac', copy 'hac', 'has' and 'hac.dict' in a directory which should be in user's PATH, for example /usr/local/bin/.
 
-hpssadm is called by 'has' via "/opt/hpss/bin/hpssadm.pl -b -U <USER> -a <KEYTAB> -j /usr/bin 2>&1". Change it in 'has' code if you call it differently. Place user name and keytab file location. Correct the java location if it differs from "/usr/bin".
+Create a 'has' systemctl service. Start 'has' with 'systemctl start has'. Then use 'hac' commands. Type "hac help" for details. 'hac' has a serachable help. You can type for example 'hac help create tape' for commands to create tapes.
+
+systemctl service is used by 'hac' to restart 'has' if it is not running. Therefore, you should either create the 'has' systemctl service or change 'hac' code to not use it. If you don't use a 'has' systemctl service, you can start 'has' by just typing "has" in terminal. Please be aware that if running 'hac' as a non-root user, restart a systemctl service will not work. In this case you need to implement a different way of restarting 'has'.
+
+'hac.log' and 'has.log' log files as well as 'hac.dict' are located in the same directory where the executables - 'hac' and 'has' - reside . Please change the code to use different directories.
+
+hpssadm is called by 'has' via "/opt/hpss/bin/hpssadm.pl -b -U <USER> -a <KEYTAB> -j /usr/bin 2>&1". Change it in 'has' code if you call it differently. Place user name and keytab file location. Correct the java location if it differs from "/usr/bin". We for example call 'hpssadm' with 'hpssssm' user. All users who can login on the HPSS core machine can run 'hac' commands. These commands will be sent to one 'hpssadm' instance running under one user. You can implement a more fine grained user management.
 
 In 'hac', 'has', and 'hac.dict' code, look for '# ATTENTION:'. Check and change these parts of code if necessary.
 
 
-## Prerequisitives ##
+## Prerequisites ##
 
 - 'hac' works with HPSS version 7.5.3 and 9.2.0. It may work with other HPSS versions but we have not tested it. 
 - perl
 - hpssadm
 
-## Implementing new hac commands ##
-Add new commands to hac.dict and add unit tests for each new 'hac' command you implemented to 'hac_test.sh'.
+## Implementing new 'hac' commands ##
+Add new commands to 'hac.dict' and add unit tests for each new 'hac' command you implemented to 'hac_test.sh'.
 
 ## License ## 
 'hac and has' is published under GNU GENERAL PUBLIC LICENSE Version 3.
@@ -46,5 +52,3 @@ If you wish to contribute to this project, please:
 
 Please be aware that your changes will be published under GNU GENERAL PUBLIC LICENSE Version 3.
 
-
-
diff --git a/hac b/hac
index 5c0b7261c3b8511bbd3207360a5a2085d28035a0..3d6d4494d8443a06f027b53215b171172a5fdebd 100755
--- a/hac
+++ b/hac
@@ -202,7 +202,7 @@ sub check_arguments {
                         my @vols = build_volume_list( 'VOL', $checked_value );
                         my @dev_ids = ();
                         foreach my $vol ( @vols ) {
-                            my $dev_id = get_dev_id_from_volume( $vol );
+                            my $dev_id = get_dev_id_from_volume_name( $vol );
                             push @dev_ids, $dev_id;
                         }
                         $checked_value = join( ',', @dev_ids );
@@ -225,7 +225,7 @@ sub check_arguments {
                     $hc =~ s/-field \"Use list in external file\" -subfield \"File\" /-field \"Use starting label\" -subfield \"Volume Label\" /g;
                     $hc =~ s/\"$file\"/\[VOL\]/g if ( defined $file );
                     $hc =~ s/\[VOL\]/$volume/g;
-                    my $dev_id = get_dev_id_from_volume( $volume );
+                    my $dev_id = get_dev_id_from_volume_name( $volume );
                     my @hac_output = get_dev_info( $dev_id ); 
                     my $ca = extract_capacity( $dev_id, @hac_output );
                     $hc =~ s/\[SIZE\]/$ca/g;
@@ -375,6 +375,30 @@ sub get_dev_id_from_volume {
     return $dev_id;
 }
 
+###########################################################################
+# ATTENTION:
+# Please pay attention that device id is extracted correctly
+###########################################################################
+sub get_dev_id_from_volume_name {
+    my $volume = shift;
+
+    my $dev_id = $volume;
+    $dev_id =~ s/\s//g;
+    if ( $dev_id =~ qr/^D00\d{3}00$/ ) {
+        $dev_id =~ s/D00//g;
+        chop ( $dev_id );
+        chop ( $dev_id );
+    } elsif ( $dev_id =~ qr/^D00\d{3}$/ ) {
+        $dev_id =~ s/D00//g;
+    } else {
+        lprint( "Invalid disk device id $dev_id\n" );
+        print "Invalid disk device id $dev_id\n";
+        exit(1);
+    }
+
+    return $dev_id;
+}
+
 ###########################################################################
 # ATTENTION:
 # You need to rewrite this subroutine
diff --git a/hac_test.sh b/hac_test.sh
index 0192f518900e6d95f83bcd39d4a8de8c3068fd7f..7255203e98dffbe832f6d5d704c66d34418735e2 100755
--- a/hac_test.sh
+++ b/hac_test.sh
@@ -717,48 +717,48 @@ check "$output" "$expected"
 echo
 
 
-echo './hac lock drive X00120 -t'
-output=$(./hac lock drive X00120 -t 2>&1)
+echo './hac lock drive D00120 -t'
+output=$(./hac lock drive D00120 -t 2>&1)
 expected="Going to send hpssadm_command = device lock -drive -id 120"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac unlock drive X00120 -t'
-output=$(./hac unlock drive X00120 -t 2>&1)
+echo './hac unlock drive D00120 -t'
+output=$(./hac unlock drive D00120 -t 2>&1)
 expected="Going to send hpssadm_command = device unlock -drive -id 120"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac lock drive X00123 -t'
-output=$(./hac lock drive X00123 -t 2>&1)
+echo './hac lock drive D00123 -t'
+output=$(./hac lock drive D00123 -t 2>&1)
 expected="Going to send hpssadm_command = device lock -drive -id 123"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac unlock drive X00123 -t'
-output=$(./hac unlock drive X00123 -t 2>&1)
+echo './hac unlock drive D00123 -t'
+output=$(./hac unlock drive D00123 -t 2>&1)
 expected="Going to send hpssadm_command = device unlock -drive -id 123"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac lock drive X00300-X00304,X00371,X00600-X00602 -t'
-output=$(./hac lock drive X00300-X00304,X00371,X00600-X00602 -t 2>&1)
+echo './hac lock drive D00300-D00304,D00371,D00600-D00602 -t'
+output=$(./hac lock drive D00300-D00304,D00371,D00600-D00602 -t 2>&1)
 expected="Going to send hpssadm_command = device lock -drive -id 300,301,302,303,304,371,600,601,602"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac unlock drive X00300-X00304,X00371,X00600-X00602 -t'
-output=$(./hac unlock drive X00300-X00304,X00371,X00600-X00602 -t 2>&1)
+echo './hac unlock drive D00300-D00304,D00371,D00600-D00602 -t'
+output=$(./hac unlock drive D00300-D00304,D00371,D00600-D00602 -t 2>&1)
 expected="Going to send hpssadm_command = device unlock -drive -id 300,301,302,303,304,371,600,601,602"
 echo $output
 check "$output" "$expected"
@@ -766,33 +766,33 @@ echo
 
 echo '----negativ'
 
-echo './hac lock drive X0012300 -t'
-output=$(./hac lock drive X0012300 -t 2>&1)
-expected="Incorrect command: \"lock drive X0012300 -t\". Refer to 'hac help' for usage."
+echo './hac lock drive D0012300 -t'
+output=$(./hac lock drive D0012300 -t 2>&1)
+expected="Incorrect command: \"lock drive D0012300 -t\". Refer to 'hac help' for usage."
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac unlock drive X0012300 -t'
-output=$(./hac unlock drive X0012300 -t 2>&1)
-expected="Incorrect command: \"unlock drive X0012300 -t\". Refer to 'hac help' for usage."
+echo './hac unlock drive D0012300 -t'
+output=$(./hac unlock drive D0012300 -t 2>&1)
+expected="Incorrect command: \"unlock drive D0012300 -t\". Refer to 'hac help' for usage."
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac lock drive X0030000-X0030400,X0037100,X0060000-X0060200 -t'
-output=$(./hac lock drive X0030000-X0030400,X0037100,X0060000-X0060200 -t 2>&1)
-expected="Incorrect command: \"lock drive X0030000-X0030400,X0037100,X0060000-X0060200 -t\". Refer to 'hac help' for usage."
+echo './hac lock drive D0030000-D0030400,D0037100,D0060000-D0060200 -t'
+output=$(./hac lock drive D0030000-D0030400,D0037100,D0060000-D0060200 -t 2>&1)
+expected="Incorrect command: \"lock drive D0030000-D0030400,D0037100,D0060000-D0060200 -t\". Refer to 'hac help' for usage."
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac unlock drive X0030000-X0030400,X0037100,X0060000-X0060200 -t'
-output=$(./hac unlock drive X0030000-X0030400,X0037100,X0060000-X0060200 -t 2>&1)
-expected="Incorrect command: \"unlock drive X0030000-X0030400,X0037100,X0060000-X0060200 -t\". Refer to 'hac help' for usage."
+echo './hac unlock drive D0030000-D0030400,D0037100,D0060000-D0060200 -t'
+output=$(./hac unlock drive D0030000-D0030400,D0037100,D0060000-D0060200 -t 2>&1)
+expected="Incorrect command: \"unlock drive D0030000-D0030400,D0037100,D0060000-D0060200 -t\". Refer to 'hac help' for usage."
 echo $output
 check "$output" "$expected"
 echo
@@ -1127,89 +1127,89 @@ echo
 echo '---volume create disk commands'
 echo '----positive'
 
-echo './hac create disk scid 10 vol X00300 -t'
-output=$(./hac create disk scid 10 vol X00300 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo './hac create disk scid 10 vol D00300 -t'
+output=$(./hac create disk scid 10 vol D00300 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac create disk scid 10 vol X00300 X00400 X00500 -t'
-output=$(./hac create disk scid 10 vol X00300 X00400 X00500 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00300
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00400
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00500"
+echo './hac create disk scid 10 vol D00300 D00400 D00500 -t'
+output=$(./hac create disk scid 10 vol D00300 D00400 D00500 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00300
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00400
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00500"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac create disk scid 10 vol X00300-X00302,X00500 -t'
-output=$(./hac create disk scid 10 vol X00300-X00302,X00500 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00300
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00301
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00302
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00500"
+echo './hac create disk scid 10 vol D00300-D00302,D00500 -t'
+output=$(./hac create disk scid 10 vol D00300-D00302,D00500 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00300
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00301
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00302
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00500"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac create disk scid 10 vol X0030000-X0030200,X0050000 -t'
-output=$(./hac create disk scid 10 vol X0030000-X0030200,X0050000 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00300
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00301
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00302
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00500"
+echo './hac create disk scid 10 vol D0030000-D0030200,D0050000 -t'
+output=$(./hac create disk scid 10 vol D0030000-D0030200,D0050000 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00300
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00301
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00302
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00500"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac create disk scid 10 vol X0030000-X00302,X0050000 -t'
-output=$(./hac create disk scid 10 vol X0030000-X00302,X0050000 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00300
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00301
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00302
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00500"
+echo './hac create disk scid 10 vol D0030000-D00302,D0050000 -t'
+output=$(./hac create disk scid 10 vol D0030000-D00302,D0050000 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00300
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00301
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00302
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00500"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo "(./hac create disk scname '10 | Storage Class 10' vol X00300 -t"
-output=$(./hac create disk scname '10 | Storage Class 10' vol X00300 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo "(./hac create disk scname '10 | Storage Class 10' vol D00300 -t"
+output=$(./hac create disk scname '10 | Storage Class 10' vol D00300 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac create disk down scid 10 vol X0030000 -t'
-output=$(./hac create disk down scid 10 vol X0030000 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo './hac create disk down scid 10 vol D0030000 -t'
+output=$(./hac create disk down scid 10 vol D0030000 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo "./hac create disk down scname '10 | Storage Class 10' vol X00300 -t"
-output=$(./hac create disk down scname '10 | Storage Class 10' vol X00300 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo "./hac create disk down scname '10 | Storage Class 10' vol D00300 -t"
+output=$(./hac create disk down scname '10 | Storage Class 10' vol D00300 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 touch disks-test.txt
-echo "X00300" > disks-test.txt
-echo "X00400" >> disks-test.txt
+echo "D00300" > disks-test.txt
+echo "D00400" >> disks-test.txt
 
 
 echo './hac create disk scid 10 file disks-test.txt -t'
 output=$(./hac create disk scid 10 file disks-test.txt -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00300
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00400"
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00300
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00400"
 echo $output
 check "$output" "$expected"
 echo
@@ -1217,8 +1217,8 @@ echo
 
 echo "./hac create disk scname '10 | Storage Class 10' file disks-test.txt -t"
 output=$(./hac create disk scname '10 | Storage Class 10' file disks-test.txt -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00300
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" X00400"
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00300
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Volume Label\" D00400"
 echo $output
 check "$output" "$expected"
 echo
@@ -1226,8 +1226,8 @@ echo
 
 echo './hac create disk down scid 10 file disks-test.txt -t'
 output=$(./hac create disk down scid 10 file disks-test.txt -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" X00300
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" X00400"
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" D00300
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" D00400"
 echo $output
 check "$output" "$expected"
 echo
@@ -1235,40 +1235,40 @@ echo
 
 echo "./hac create disk down scname '10 | Storage Class 10' file disks-test.txt -t"
 output=$(./hac create disk down scname '10 | Storage Class 10' file disks-test.txt -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" X00300
-Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" X00400"
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" D00300
+Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Volume Label\" D00400"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac create disk scid 10 vol X00300 count 2 inc 1 -t'
-output=$(./hac create disk scid 10 vol X00300 count 2 inc 1 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo './hac create disk scid 10 vol D00300 count 2 inc 1 -t'
+output=$(./hac create disk scid 10 vol D00300 count 2 inc 1 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo "./hac create disk scname '10 | Storage Class 10' vol X00300 count 2 inc 1 -t"
-output=$(./hac create disk scname '10 | Storage Class 10' vol X00300 count 2 inc 1 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo "./hac create disk scname '10 | Storage Class 10' vol D00300 count 2 inc 1 -t"
+output=$(./hac create disk scname '10 | Storage Class 10' vol D00300 count 2 inc 1 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac create disk down scid 10 vol X00300 count 2 inc 1 -t'
-output=$(./hac create disk down scid 10 vol X00300 count 2 inc 1 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo './hac create disk down scid 10 vol D00300 count 2 inc 1 -t'
+output=$(./hac create disk down scid 10 vol D00300 count 2 inc 1 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" 10 -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo "./hac create disk down scname '10 | Storage Class 10' vol X00300 count 2 inc 1 -t"
-output=$(./hac create disk down scname '10 | Storage Class 10' vol X00300 count 2 inc 1 -t 2>&1)
-expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo "./hac create disk down scname '10 | Storage Class 10' vol D00300 count 2 inc 1 -t"
+output=$(./hac create disk down scname '10 | Storage Class 10' vol D00300 count 2 inc 1 -t 2>&1)
+expected="Going to send hpssadm_command = volume create_disk -field \"Initialization Fields\" -subfield \"Storage Class\" \"10 | Storage Class 10\" -field \"Optional\" -subfield \"PV Size\" 7811956728KB -field \"Optional\" -subfield \"Create DOWN\" \"on\" -field \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
@@ -1363,25 +1363,25 @@ echo
 echo '---volume import disk commands'
 echo '----positive'
 
-echo './hac import def disk it def vol X00300 -t'
-output=$(./hac import def disk it def vol X00300 -t 2>&1)
-expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - Default Disk\" -field \"Import Type\" \"Default Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo './hac import def disk it def vol D00300 -t'
+output=$(./hac import def disk it def vol D00300 -t 2>&1)
+expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - Default Disk\" -field \"Import Type\" \"Default Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac import def disk it def vol X00300 X00400 X00500 -t'
-output=$(./hac import def disk it def vol X00300 X00400 X00500 -t 2>&1)
-expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - Default Disk\" -field \"Import Type\" \"Default Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00400 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00500"
+echo './hac import def disk it def vol D00300 D00400 D00500 -t'
+output=$(./hac import def disk it def vol D00300 D00400 D00500 -t 2>&1)
+expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - Default Disk\" -field \"Import Type\" \"Default Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00400 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00500"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac import def disk it def vol X00300-X00302 -t'
-output=$(./hac import def disk it def vol X00300-X00302 -t 2>&1)
-expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - Default Disk\" -field \"Import Type\" \"Default Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00301 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00302"
+echo './hac import def disk it def vol D00300-D00302 -t'
+output=$(./hac import def disk it def vol D00300-D00302 -t 2>&1)
+expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - Default Disk\" -field \"Import Type\" \"Default Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00301 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00302"
 echo $output
 check "$output" "$expected"
 echo
@@ -1395,17 +1395,17 @@ check "$output" "$expected"
 echo
 
 
-echo './hac import def disk it ow vol X00300 count 2 inc 1 -t'
-output=$(./hac import def disk it ow vol X00300 count 2 inc 1 -t 2>&1)
-expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - Default Disk\" -field \"Import Type\" \"Overwrite Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo './hac import def disk it ow vol D00300 count 2 inc 1 -t'
+output=$(./hac import def disk it ow vol D00300 count 2 inc 1 -t 2>&1)
+expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - Default Disk\" -field \"Import Type\" \"Overwrite Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac import san disk it def vol X00300 -t'
-output=$(./hac import san disk it def vol X00300 -t 2>&1)
-expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - SAN Attached Disk\" -field \"Import Type\" \"Default Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo './hac import san disk it def vol D00300 -t'
+output=$(./hac import san disk it def vol D00300 -t 2>&1)
+expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - SAN Attached Disk\" -field \"Import Type\" \"Default Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
@@ -1419,9 +1419,9 @@ check "$output" "$expected"
 echo
 
 
-echo './hac import san disk it def vol X00300 count 2 inc 1 -t'
-output=$(./hac import san disk it def vol X00300 count 2 inc 1 -t 2>&1)
-expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - SAN Attached Disk\" -field \"Import Type\" \"Default Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo './hac import san disk it def vol D00300 count 2 inc 1 -t'
+output=$(./hac import san disk it def vol D00300 count 2 inc 1 -t 2>&1)
+expected="Going to send hpssadm_command = volume import_disk -field \"Media Type\" \"Generic - SAN Attached Disk\" -field \"Import Type\" \"Default Import\" -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
@@ -1479,19 +1479,19 @@ echo
 echo '---volume delete disk resources commands'
 echo '----positive'
 
-echo './hac del disk vol X00300 -t'
-output=$(./hac del disk vol X00300 -t 2>&1)
+echo './hac del disk vol D00300 -t'
+output=$(./hac del disk vol D00300 -t 2>&1)
 expected="Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Bytes Read\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Bytes Written\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Number Of Errors\"
-Going to send hpssadm_command = volume delete -field \"Use starting label\" -subfield \"Volume Label\" X00300"
+Going to send hpssadm_command = volume delete -field \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac del disk vol X00300 X00400 X00500 -t'
-output=$(./hac del disk vol X00300 X00400 X00500 -t 2>&1)
+echo './hac del disk vol D00300 D00400 D00500 -t'
+output=$(./hac del disk vol D00300 D00400 D00500 -t 2>&1)
 expected="Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Bytes Read\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Bytes Written\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Number Of Errors\"
@@ -1501,14 +1501,14 @@ Going to send hpssadm_command = device update -type \"Mover Device Information\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 500 -field \"Device Record\" -subfield \"Bytes Read\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 500 -field \"Device Record\" -subfield \"Bytes Written\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 500 -field \"Device Record\" -subfield \"Number Of Errors\"
-Going to send hpssadm_command = volume delete -field \"Use starting label\" -subfield \"Volume Label\" X00300 -field \"Use starting label\" -subfield \"Volume Label\" X00400 -field \"Use starting label\" -subfield \"Volume Label\" X00500"
+Going to send hpssadm_command = volume delete -field \"Use starting label\" -subfield \"Volume Label\" D00300 -field \"Use starting label\" -subfield \"Volume Label\" D00400 -field \"Use starting label\" -subfield \"Volume Label\" D00500"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac del disk vol X00300,X00400,X00500 -t'
-output=$(./hac del disk vol X00300,X00400,X00500 -t 2>&1)
+echo './hac del disk vol D00300,D00400,D00500 -t'
+output=$(./hac del disk vol D00300,D00400,D00500 -t 2>&1)
 expected="Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Bytes Read\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Bytes Written\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Number Of Errors\"
@@ -1518,14 +1518,14 @@ Going to send hpssadm_command = device update -type \"Mover Device Information\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 500 -field \"Device Record\" -subfield \"Bytes Read\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 500 -field \"Device Record\" -subfield \"Bytes Written\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 500 -field \"Device Record\" -subfield \"Number Of Errors\"
-Going to send hpssadm_command = volume delete -field \"Use starting label\" -subfield \"Volume Label\" X00300 -field \"Use starting label\" -subfield \"Volume Label\" X00400 -field \"Use starting label\" -subfield \"Volume Label\" X00500"
+Going to send hpssadm_command = volume delete -field \"Use starting label\" -subfield \"Volume Label\" D00300 -field \"Use starting label\" -subfield \"Volume Label\" D00400 -field \"Use starting label\" -subfield \"Volume Label\" D00500"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac del disk vol X00300-X00302,X00500 -t'
-output=$(./hac del disk vol X00300-X00302,X00500 -t 2>&1)
+echo './hac del disk vol D00300-D00302,D00500 -t'
+output=$(./hac del disk vol D00300-D00302,D00500 -t 2>&1)
 expected="Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Bytes Read\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Bytes Written\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 300 -field \"Device Record\" -subfield \"Number Of Errors\"
@@ -1538,7 +1538,7 @@ Going to send hpssadm_command = device update -type \"Mover Device Information\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 500 -field \"Device Record\" -subfield \"Bytes Read\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 500 -field \"Device Record\" -subfield \"Bytes Written\"
 Going to send hpssadm_command = device update -type \"Mover Device Information\" -id 500 -field \"Device Record\" -subfield \"Number Of Errors\"
-Going to send hpssadm_command = volume delete -field \"Use starting label\" -subfield \"Volume Label\" X00300 -field \"Use starting label\" -subfield \"Volume Label\" X00301 -field \"Use starting label\" -subfield \"Volume Label\" X00302 -field \"Use starting label\" -subfield \"Volume Label\" X00500"
+Going to send hpssadm_command = volume delete -field \"Use starting label\" -subfield \"Volume Label\" D00300 -field \"Use starting label\" -subfield \"Volume Label\" D00301 -field \"Use starting label\" -subfield \"Volume Label\" D00302 -field \"Use starting label\" -subfield \"Volume Label\" D00500"
 echo $output
 check "$output" "$expected"
 echo
@@ -1605,33 +1605,33 @@ echo
 echo '---volume export disk commands'
 echo '----positive'
 
-echo './hac export disk vol X00300 -t'
-output=$(./hac export disk vol X00300 -t 2>&1)
-expected="Going to send hpssadm_command = volume export -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo './hac export disk vol D00300 -t'
+output=$(./hac export disk vol D00300 -t 2>&1)
+expected="Going to send hpssadm_command = volume export -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac export disk vol X00300 X00301 X00302 -t'
-output=$(./hac export disk vol X00300 X00301 X00302 -t 2>&1)
-expected="Going to send hpssadm_command = volume export -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00301 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00302"
+echo './hac export disk vol D00300 D00301 D00302 -t'
+output=$(./hac export disk vol D00300 D00301 D00302 -t 2>&1)
+expected="Going to send hpssadm_command = volume export -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00301 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00302"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac export disk vol X00300,X00301,X00302 -t'
-output=$(./hac export disk vol X00300,X00301,X00302 -t 2>&1)
-expected="Going to send hpssadm_command = volume export -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00301 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00302"
+echo './hac export disk vol D00300,D00301,D00302 -t'
+output=$(./hac export disk vol D00300,D00301,D00302 -t 2>&1)
+expected="Going to send hpssadm_command = volume export -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00301 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00302"
 echo $output
 check "$output" "$expected"
 echo
 
 
-echo './hac export disk vol X00300-X00302 -t'
-output=$(./hac export disk vol X00300-X00302 -t 2>&1)
-expected="Going to send hpssadm_command = volume export -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00301 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00302"
+echo './hac export disk vol D00300-D00302 -t'
+output=$(./hac export disk vol D00300-D00302 -t 2>&1)
+expected="Going to send hpssadm_command = volume export -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00301 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00302"
 echo $output
 check "$output" "$expected"
 echo
@@ -1645,9 +1645,9 @@ check "$output" "$expected"
 echo
 
 
-echo './hac export disk vol X00300 count 2 inc 1 -t'
-output=$(./hac export disk vol X00300 count 2 inc 1 -t 2>&1)
-expected="Going to send hpssadm_command = volume export -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" X00300"
+echo './hac export disk vol D00300 count 2 inc 1 -t'
+output=$(./hac export disk vol D00300 count 2 inc 1 -t 2>&1)
+expected="Going to send hpssadm_command = volume export -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Count\" 2 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Fill Increment\" 1 -field \"Build List of Volumes\" -subfield \"Use starting label\" -subfield \"Volume Label\" D00300"
 echo $output
 check "$output" "$expected"
 echo