Change in hrStorage jrb directory naming usage breaks snmp graphs

When we switched to OpenNMS 1.9.93, the directory naming scheme used for hrStorage jrb files changed from a simple drive letter to a lengthier drive description.

drwxrwxr-x. 20 root root 4096 Nov 30 12:37 .
drwxrwxr-x. 6 root root 4096 Nov 30 12:30 ..
drwxrwxr-x. 2 root root 4096 Jan 26 2010 A
drwxrwxr-x. 2 root root 4096 Nov 17 13:11 A:\
drwxrwxr-x. 2 root root 4096 Jan 26 2010 C
drwxrwxr-x. 2 root root 4096 Nov 17 13:11 C:\ Label:OS Serial Number 906af923
drwxrwxr-x. 2 root root 4096 Jan 26 2010 D
drwxrwxr-x. 2 root root 4096 Nov 17 13:11 D:\
drwxrwxr-x. 2 root root 4096 Jan 26 2010 E
drwxrwxr-x. 2 root root 4096 Nov 17 13:11 E:\ Label:Shared Serial Number 488f9160
drwxrwxr-x. 2 root root 4096 Jan 26 2010 F
drwxrwxr-x. 2 root root 4096 Nov 17 13:11 F:\ Label:Khalix Folders Serial Number c8db96d1
drwxrwxr-x. 2 root root 4096 Jan 26 2010 G
drwxrwxr-x. 2 root root 4096 Nov 17 13:11 G:\ Label:ONE SHOT Serial Number 7c9e0dc3
drwxrwxr-x. 2 root root 4096 Jan 26 2010 I
drwxrwxr-x. 2 root root 4096 Nov 17 13:11 I:\ Label:TWO SHOT Serial Number d894efe7
drwxrwxr-x. 2 root root 4096 Jan 26 2010 PhysicalMemory
drwxrwxr-x. 2 root root 4096 Nov 17 13:11 Physical Memory
drwxrwxr-x. 2 root root 4096 Jan 26 2010 VirtualMemory
drwxrwxr-x. 2 root root 4096 Nov 17 13:11 Virtual Memory

SNMP graphing doesn't seem to be able to handle the spaces and '\' in the newer directory/path names. The following lines show up in the jetty.log
/57/hrStorageIndex/D:/hrStorageSize.jrb [non existent]
        at org.jrobin.core.RrdDb.<init>(RrdDb.java:226)
        at org.jrobin.core.RrdDb.<init>(RrdDb.java:202)
        at org.jrobin.data.DataProcessor.getRrd(DataProcessor.java:835)
        at org.jrobin.data.DataProcessor.fetchRrdData(DataProcessor.java:697)
        at org.jrobin.data.DataProcessor.processData(DataProcessor.java:544)
        at org.jrobin.graph.RrdGraph.fetchData(RrdGraph.java:537)
        at org.jrobin.graph.RrdGraph.createGraph(RrdGraph.java:74)
        at org.jrobin.graph.RrdGraph.<init>(RrdGraph.java:53)
        at org.opennms.netmgt.rrd.jrobin.JRobinRrdStrategy.createGraphReturnDetails(
JRobinRrdStrategy.java:354)
        ... 92 more

Which is preferred: rolling back to the older directory naming scheme or fixing the graphing module's issue with spaces and backslashes in building directory paths?