diff --git a/opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/wsman-microsoft-windows-virtmem.properties b/opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/wsman-microsoft-windows-virtmem.properties
deleted file mode 100644
index 9f2c81baacfa..000000000000
--- a/opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/wsman-microsoft-windows-virtmem.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-##############################################################################
-##
-##  Please add report definition in a new line to make it easier
-##  for script based sanity checks
-##
-##################################################
-
-reports=microsoft.windows.virtmem1
-
-report.microsoft.windows.virtmem1.name=Virtual Memory
-report.microsoft.windows.virtmem1.columns=freeVirtMem,totalVirtMem
-report.microsoft.windows.virtmem1.type=nodeSnmp
-report.microsoft.windows.virtmem1.suppress=microsoft.windows.virtmem
-report.microsoft.windows.virtmem1.command=--title="Virtual Memory Usage (WinRM)" \
- --vertical-label="Memory" \
- DEF:freekBytes={rrd1}:freeVirtMem:AVERAGE \
- DEF:totalkBytes={rrd2}:totalVirtMem:AVERAGE \
- CDEF:freeBytes=freekBytes,1024,* \
- CDEF:totalBytes=totalkBytes,1024,* \
- CDEF:usedBytes=totalBytes,freeBytes,- \
- AREA:usedBytes#ff0000:"Used" \
- GPRINT:usedBytes:AVERAGE:"Avg \\: %10.2lf %s" \
- GPRINT:usedBytes:MIN:"Min \\: %10.2lf %s" \
- GPRINT:usedBytes:MAX:"Max \\: %10.2lf %s\\n" \
- STACK:freeBytes#0cff00:"Free" \
- GPRINT:freeBytes:AVERAGE:"Avg \\: %10.2lf %s" \
- GPRINT:freeBytes:MIN:"Min \\: %10.2lf %s" \
- GPRINT:freeBytes:MAX:"Max \\: %10.2lf %s\\n" \
- LINE2:totalBytes#0000ff:"Total" \
- GPRINT:totalBytes:AVERAGE:"Avg \\: %10.2lf %s" \
- GPRINT:totalBytes:MIN:"Min \\: %10.2lf %s" \
- GPRINT:totalBytes:MAX:"Max \\: %10.2lf %s\\n"
diff --git a/opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/wsman-microsoft-windows.properties b/opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/wsman-microsoft-windows.properties
index afa80ac0f4b8..34e4238931cb 100644
--- a/opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/wsman-microsoft-windows.properties
+++ b/opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties.d/wsman-microsoft-windows.properties
@@ -10,23 +10,22 @@ reports=microsoft.windows.virtmem
 report.microsoft.windows.virtmem.name=Virtual Memory
 report.microsoft.windows.virtmem.columns=freeVirtMem,totalVirtMem
 report.microsoft.windows.virtmem.type=nodeSnmp
-report.microsoft.windows.virtmem.command=--title="Virtual Memory Usage" \
+report.microsoft.windows.virtmem.command=--title="Virtual Memory Usage (WinRM)" \
  --vertical-label="Memory" \
- DEF:freeBytes={rrd1}:freeVirtMem:AVERAGE \
- DEF:totalBytes={rrd2}:totalVirtMem:AVERAGE \
- CDEF:freeBits=freeBytes,8,* \
- CDEF:totalBits=totalBytes,8,* \
- CDEF:usedBits=totalBits,freeBits,- \
- AREA:usedBits#ff0000:"Used" \
- GPRINT:usedBits:AVERAGE:"Avg \\: %10.2lf %s" \
- GPRINT:usedBits:MIN:"Min \\: %10.2lf %s" \
- GPRINT:usedBits:MAX:"Max \\: %10.2lf %s\\n" \
- STACK:freeBits#0cff00:"Free" \
- GPRINT:freeBits:AVERAGE:"Avg \\: %10.2lf %s" \
- GPRINT:freeBits:MIN:"Min \\: %10.2lf %s" \
- GPRINT:freeBits:MAX:"Max \\: %10.2lf %s\\n" \
- LINE2:totalBits#0000ff:"Total" \
- GPRINT:totalBits:AVERAGE:"Avg \\: %10.2lf %s" \
- GPRINT:totalBits:MIN:"Min \\: %10.2lf %s" \
- GPRINT:totalBits:MAX:"Max \\: %10.2lf %s\\n"
-
+ DEF:freekBytes={rrd1}:freeVirtMem:AVERAGE \
+ DEF:totalkBytes={rrd2}:totalVirtMem:AVERAGE \
+ CDEF:freeBytes=freekBytes,1024,* \
+ CDEF:totalBytes=totalkBytes,1024,* \
+ CDEF:usedBytes=totalBytes,freeBytes,- \
+ AREA:usedBytes#ff0000:"Used" \
+ GPRINT:usedBytes:AVERAGE:"Avg \\: %10.2lf %s" \
+ GPRINT:usedBytes:MIN:"Min \\: %10.2lf %s" \
+ GPRINT:usedBytes:MAX:"Max \\: %10.2lf %s\\n" \
+ STACK:freeBytes#0cff00:"Free" \
+ GPRINT:freeBytes:AVERAGE:"Avg \\: %10.2lf %s" \
+ GPRINT:freeBytes:MIN:"Min \\: %10.2lf %s" \
+ GPRINT:freeBytes:MAX:"Max \\: %10.2lf %s\\n" \
+ LINE2:totalBytes#0000ff:"Total" \
+ GPRINT:totalBytes:AVERAGE:"Avg \\: %10.2lf %s" \
+ GPRINT:totalBytes:MIN:"Min \\: %10.2lf %s" \
+ GPRINT:totalBytes:MAX:"Max \\: %10.2lf %s\\n"