diff --git a/install.sh b/install.sh
index afbf03ef77..11ca541d9c 100755
--- a/install.sh
+++ b/install.sh
@@ -1152,11 +1152,11 @@ IM_PROBES_KVM_HOST_SYSTEM_FILES="\
      src/im_mad/remotes/kvm-probes.d/host/system/version.sh"
 
 IM_PROBES_KVM_VM_MONITOR_FILES="\
-     src/im_mad/remotes/kvm-probes.d/vms/monitor/poll.rb \
-     src/im_mad/remotes/kvm-probes.d/vms/monitor/monitor_ds_vm.rb"
+     src/im_mad/remotes/kvm-probes.d/vm/monitor/poll.rb \
+     src/im_mad/remotes/kvm-probes.d/vm/monitor/monitor_ds_vm.rb"
 
 IM_PROBES_KVM_VM_STATUS_FILES="\
-     src/im_mad/remotes/kvm-probes.d/vms/status/state.rb"
+     src/im_mad/remotes/kvm-probes.d/vm/status/state.rb"
 
 IM_PROBES_ETC_KVM_PROBES_FILES="\
     src/im_mad/remotes/kvm-probes.d/pci.conf \
@@ -1178,10 +1178,10 @@ IM_PROBES_DUMMY_HOST_SYSTEM_FILES="\
      src/im_mad/remotes/dummy-probes.d/host/system/system.rb"
 
 IM_PROBES_DUMMY_VM_MONITOR_FILES="\
-     src/im_mad/remotes/dummy-probes.d/vms/monitor/monitor.rb"
+     src/im_mad/remotes/dummy-probes.d/vm/monitor/monitor.rb"
 
 IM_PROBES_DUMMY_VM_STATUS_FILES="\
-     src/im_mad/remotes/kvm-probes.d/vms/status/state.rb"
+     src/im_mad/remotes/kvm-probes.d/vm/status/state.rb"
 
 # LXD PROBES
 IM_PROBES_LXD_FILES="\
@@ -1209,11 +1209,11 @@ IM_PROBES_LXD_HOST_SYSTEM_FILES="\
      src/im_mad/remotes/lxd-probes.d/host/system/version.sh"
 
 IM_PROBES_LXD_VM_MONITOR_FILES="\
-     src/im_mad/remotes/lxd-probes.d/vms/monitor/poll.rb \
-     src/im_mad/remotes/lxd-probes.d/vms/monitor/monitor_ds_vm.rb"
+     src/im_mad/remotes/lxd-probes.d/vm/monitor/poll.rb \
+     src/im_mad/remotes/lxd-probes.d/vm/monitor/monitor_ds_vm.rb"
 
 IM_PROBES_LXD_VM_STATUS_FILES="\
-     src/im_mad/remotes/lxd-probes.d/vms/status/state.rb"
+     src/im_mad/remotes/lxd-probes.d/vm/status/state.rb"
 
 IM_PROBES_ETC_LXD_PROBES_FILES="\
     src/im_mad/remotes/lxd-probes.d/pci.conf \
diff --git a/src/im_mad/remotes/dummy-probes.d/vms/monitor/monitor.rb b/src/im_mad/remotes/dummy-probes.d/vm/monitor/monitor.rb
similarity index 100%
rename from src/im_mad/remotes/dummy-probes.d/vms/monitor/monitor.rb
rename to src/im_mad/remotes/dummy-probes.d/vm/monitor/monitor.rb
diff --git a/src/im_mad/remotes/kvm-probes.d/vms/monitor/monitor_ds_vm.rb b/src/im_mad/remotes/kvm-probes.d/vm/monitor/monitor_ds_vm.rb
similarity index 100%
rename from src/im_mad/remotes/kvm-probes.d/vms/monitor/monitor_ds_vm.rb
rename to src/im_mad/remotes/kvm-probes.d/vm/monitor/monitor_ds_vm.rb
diff --git a/src/im_mad/remotes/kvm-probes.d/vms/monitor/poll.rb b/src/im_mad/remotes/kvm-probes.d/vm/monitor/poll.rb
similarity index 100%
rename from src/im_mad/remotes/kvm-probes.d/vms/monitor/poll.rb
rename to src/im_mad/remotes/kvm-probes.d/vm/monitor/poll.rb
diff --git a/src/im_mad/remotes/kvm-probes.d/vms/status/state.rb b/src/im_mad/remotes/kvm-probes.d/vm/status/state.rb
similarity index 100%
rename from src/im_mad/remotes/kvm-probes.d/vms/status/state.rb
rename to src/im_mad/remotes/kvm-probes.d/vm/status/state.rb
diff --git a/src/im_mad/remotes/lxd-probes.d/vms/monitor/monitor_ds_vm.rb b/src/im_mad/remotes/lxd-probes.d/vm/monitor/monitor_ds_vm.rb
similarity index 100%
rename from src/im_mad/remotes/lxd-probes.d/vms/monitor/monitor_ds_vm.rb
rename to src/im_mad/remotes/lxd-probes.d/vm/monitor/monitor_ds_vm.rb
diff --git a/src/im_mad/remotes/lxd-probes.d/vms/monitor/poll.rb b/src/im_mad/remotes/lxd-probes.d/vm/monitor/poll.rb
similarity index 100%
rename from src/im_mad/remotes/lxd-probes.d/vms/monitor/poll.rb
rename to src/im_mad/remotes/lxd-probes.d/vm/monitor/poll.rb
diff --git a/src/im_mad/remotes/lxd-probes.d/vms/status/state.rb b/src/im_mad/remotes/lxd-probes.d/vm/status/state.rb
similarity index 100%
rename from src/im_mad/remotes/lxd-probes.d/vms/status/state.rb
rename to src/im_mad/remotes/lxd-probes.d/vm/status/state.rb