diff --git a/test/integration/targets/netapp_eseries_alerts/aliases b/test/integration/targets/netapp_e_alerts/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_alerts/aliases
rename to test/integration/targets/netapp_e_alerts/aliases
diff --git a/test/integration/targets/netapp_eseries_alerts/tasks/main.yml b/test/integration/targets/netapp_e_alerts/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_alerts/tasks/main.yml
rename to test/integration/targets/netapp_e_alerts/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_alerts/tasks/run.yml b/test/integration/targets/netapp_e_alerts/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_alerts/tasks/run.yml
rename to test/integration/targets/netapp_e_alerts/tasks/run.yml
diff --git a/test/integration/targets/netapp_eseries_asup/aliases b/test/integration/targets/netapp_e_asup/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_asup/aliases
rename to test/integration/targets/netapp_e_asup/aliases
diff --git a/test/integration/targets/netapp_eseries_asup/tasks/main.yml b/test/integration/targets/netapp_e_asup/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_asup/tasks/main.yml
rename to test/integration/targets/netapp_e_asup/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_asup/tasks/run.yml b/test/integration/targets/netapp_e_asup/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_asup/tasks/run.yml
rename to test/integration/targets/netapp_e_asup/tasks/run.yml
diff --git a/test/integration/targets/netapp_eseries_drive_firmware/aliases b/test/integration/targets/netapp_e_drive_firmware/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_drive_firmware/aliases
rename to test/integration/targets/netapp_e_drive_firmware/aliases
diff --git a/test/integration/targets/netapp_eseries_drive_firmware/tasks/main.yml b/test/integration/targets/netapp_e_drive_firmware/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_drive_firmware/tasks/main.yml
rename to test/integration/targets/netapp_e_drive_firmware/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_drive_firmware/tasks/run.yml b/test/integration/targets/netapp_e_drive_firmware/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_drive_firmware/tasks/run.yml
rename to test/integration/targets/netapp_e_drive_firmware/tasks/run.yml
diff --git a/test/integration/targets/netapp_eseries_firmware/aliases b/test/integration/targets/netapp_e_firmware/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_firmware/aliases
rename to test/integration/targets/netapp_e_firmware/aliases
diff --git a/test/integration/targets/netapp_eseries_firmware/tasks/main.yml b/test/integration/targets/netapp_e_firmware/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_firmware/tasks/main.yml
rename to test/integration/targets/netapp_e_firmware/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_firmware/tasks/run.yml b/test/integration/targets/netapp_e_firmware/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_firmware/tasks/run.yml
rename to test/integration/targets/netapp_e_firmware/tasks/run.yml
diff --git a/test/integration/targets/netapp_eseries_global/aliases b/test/integration/targets/netapp_e_global/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_global/aliases
rename to test/integration/targets/netapp_e_global/aliases
diff --git a/test/integration/targets/netapp_eseries_global/tasks/main.yml b/test/integration/targets/netapp_e_global/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_global/tasks/main.yml
rename to test/integration/targets/netapp_e_global/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_global/tasks/run.yml b/test/integration/targets/netapp_e_global/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_global/tasks/run.yml
rename to test/integration/targets/netapp_e_global/tasks/run.yml
diff --git a/test/integration/targets/netapp_eseries_host/aliases b/test/integration/targets/netapp_e_host/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_host/aliases
rename to test/integration/targets/netapp_e_host/aliases
diff --git a/test/integration/targets/netapp_eseries_host/tasks/main.yml b/test/integration/targets/netapp_e_host/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_host/tasks/main.yml
rename to test/integration/targets/netapp_e_host/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_host/tasks/run.yml b/test/integration/targets/netapp_e_host/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_host/tasks/run.yml
rename to test/integration/targets/netapp_e_host/tasks/run.yml
diff --git a/test/integration/targets/netapp_eseries_iscsi_interface/aliases b/test/integration/targets/netapp_e_iscsi_interface/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_iscsi_interface/aliases
rename to test/integration/targets/netapp_e_iscsi_interface/aliases
diff --git a/test/integration/targets/netapp_eseries_iscsi_interface/tasks/main.yml b/test/integration/targets/netapp_e_iscsi_interface/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_iscsi_interface/tasks/main.yml
rename to test/integration/targets/netapp_e_iscsi_interface/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_iscsi_interface/tasks/run.yml b/test/integration/targets/netapp_e_iscsi_interface/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_iscsi_interface/tasks/run.yml
rename to test/integration/targets/netapp_e_iscsi_interface/tasks/run.yml
diff --git a/test/integration/targets/netapp_eseries_iscsi_target/aliases b/test/integration/targets/netapp_e_iscsi_target/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_iscsi_target/aliases
rename to test/integration/targets/netapp_e_iscsi_target/aliases
diff --git a/test/integration/targets/netapp_eseries_iscsi_target/tasks/main.yml b/test/integration/targets/netapp_e_iscsi_target/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_iscsi_target/tasks/main.yml
rename to test/integration/targets/netapp_e_iscsi_target/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_iscsi_target/tasks/run.yml b/test/integration/targets/netapp_e_iscsi_target/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_iscsi_target/tasks/run.yml
rename to test/integration/targets/netapp_e_iscsi_target/tasks/run.yml
diff --git a/test/integration/targets/netapp_eseries_lun_mapping/aliases b/test/integration/targets/netapp_e_lun_mapping/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_lun_mapping/aliases
rename to test/integration/targets/netapp_e_lun_mapping/aliases
diff --git a/test/integration/targets/netapp_eseries_lun_mapping/tasks/main.yml b/test/integration/targets/netapp_e_lun_mapping/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_lun_mapping/tasks/main.yml
rename to test/integration/targets/netapp_e_lun_mapping/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_lun_mapping/tasks/run.yml b/test/integration/targets/netapp_e_lun_mapping/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_lun_mapping/tasks/run.yml
rename to test/integration/targets/netapp_e_lun_mapping/tasks/run.yml
diff --git a/test/integration/targets/netapp_eseries_storagepool/aliases b/test/integration/targets/netapp_e_storagepool/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_storagepool/aliases
rename to test/integration/targets/netapp_e_storagepool/aliases
diff --git a/test/integration/targets/netapp_eseries_storagepool/tasks/main.yml b/test/integration/targets/netapp_e_storagepool/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_storagepool/tasks/main.yml
rename to test/integration/targets/netapp_e_storagepool/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_storagepool/tasks/run.yml b/test/integration/targets/netapp_e_storagepool/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_storagepool/tasks/run.yml
rename to test/integration/targets/netapp_e_storagepool/tasks/run.yml
diff --git a/test/integration/targets/netapp_eseries_volume/aliases b/test/integration/targets/netapp_e_volume/aliases
similarity index 100%
rename from test/integration/targets/netapp_eseries_volume/aliases
rename to test/integration/targets/netapp_e_volume/aliases
diff --git a/test/integration/targets/netapp_eseries_volume/tasks/main.yml b/test/integration/targets/netapp_e_volume/tasks/main.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_volume/tasks/main.yml
rename to test/integration/targets/netapp_e_volume/tasks/main.yml
diff --git a/test/integration/targets/netapp_eseries_volume/tasks/run.yml b/test/integration/targets/netapp_e_volume/tasks/run.yml
similarity index 100%
rename from test/integration/targets/netapp_eseries_volume/tasks/run.yml
rename to test/integration/targets/netapp_e_volume/tasks/run.yml