diff --git a/tests/data/apc_environmental_manager.json b/tests/data/apc_environmental-manager.json
similarity index 100%
rename from tests/data/apc_environmental_manager.json
rename to tests/data/apc_environmental-manager.json
diff --git a/tests/data/arista-mos_metamux48_c_0_16.json b/tests/data/arista-mos_metamux48-c-0-16.json
similarity index 100%
rename from tests/data/arista-mos_metamux48_c_0_16.json
rename to tests/data/arista-mos_metamux48-c-0-16.json
diff --git a/tests/data/barracudaspamfirewall_email_sg.json b/tests/data/barracudaspamfirewall_email-sg.json
similarity index 100%
rename from tests/data/barracudaspamfirewall_email_sg.json
rename to tests/data/barracudaspamfirewall_email-sg.json
diff --git a/tests/data/ciscosb_esw540_8p.json b/tests/data/ciscosb_esw540-8p.json
similarity index 100%
rename from tests/data/ciscosb_esw540_8p.json
rename to tests/data/ciscosb_esw540-8p.json
diff --git a/tests/data/ciscospa_spa112_1.json b/tests/data/ciscospa_spa112-1.json
similarity index 100%
rename from tests/data/ciscospa_spa112_1.json
rename to tests/data/ciscospa_spa112-1.json
diff --git a/tests/data/hiveos-wireless_320_n.json b/tests/data/hiveos-wireless_320-n.json
similarity index 100%
rename from tests/data/hiveos-wireless_320_n.json
rename to tests/data/hiveos-wireless_320-n.json
diff --git a/tests/data/junos_mx5t_isis.json b/tests/data/junos_mx5t-isis.json
similarity index 100%
rename from tests/data/junos_mx5t_isis.json
rename to tests/data/junos_mx5t-isis.json
diff --git a/tests/data/raritan-pdu_px2_temp.json b/tests/data/raritan-pdu_px2-temp.json
similarity index 100%
rename from tests/data/raritan-pdu_px2_temp.json
rename to tests/data/raritan-pdu_px2-temp.json
diff --git a/tests/snmpsim/apc_environmental_manager.snmprec b/tests/snmpsim/apc_environmental-manager.snmprec
similarity index 100%
rename from tests/snmpsim/apc_environmental_manager.snmprec
rename to tests/snmpsim/apc_environmental-manager.snmprec
diff --git a/tests/snmpsim/arista-mos_metamux48_c_0_16.snmprec b/tests/snmpsim/arista-mos_metamux48-c-0-16.snmprec
similarity index 100%
rename from tests/snmpsim/arista-mos_metamux48_c_0_16.snmprec
rename to tests/snmpsim/arista-mos_metamux48-c-0-16.snmprec
diff --git a/tests/snmpsim/barracudaspamfirewall_email_sg.snmprec b/tests/snmpsim/barracudaspamfirewall_email-sg.snmprec
similarity index 100%
rename from tests/snmpsim/barracudaspamfirewall_email_sg.snmprec
rename to tests/snmpsim/barracudaspamfirewall_email-sg.snmprec
diff --git a/tests/snmpsim/ciscosb_esw540_8p.snmprec b/tests/snmpsim/ciscosb_esw540-8p.snmprec
similarity index 100%
rename from tests/snmpsim/ciscosb_esw540_8p.snmprec
rename to tests/snmpsim/ciscosb_esw540-8p.snmprec
diff --git a/tests/snmpsim/ciscospa_spa112_1.snmprec b/tests/snmpsim/ciscospa_spa112-1.snmprec
similarity index 100%
rename from tests/snmpsim/ciscospa_spa112_1.snmprec
rename to tests/snmpsim/ciscospa_spa112-1.snmprec
diff --git a/tests/snmpsim/hiveos-wireless_320_n.snmprec b/tests/snmpsim/hiveos-wireless_320-n.snmprec
similarity index 100%
rename from tests/snmpsim/hiveos-wireless_320_n.snmprec
rename to tests/snmpsim/hiveos-wireless_320-n.snmprec
diff --git a/tests/snmpsim/junos_mx5t_isis.snmprec b/tests/snmpsim/junos_mx5t-isis.snmprec
similarity index 100%
rename from tests/snmpsim/junos_mx5t_isis.snmprec
rename to tests/snmpsim/junos_mx5t-isis.snmprec
diff --git a/tests/snmpsim/raritan-pdu_px2_temp.snmprec b/tests/snmpsim/raritan-pdu_px2-temp.snmprec
similarity index 100%
rename from tests/snmpsim/raritan-pdu_px2_temp.snmprec
rename to tests/snmpsim/raritan-pdu_px2-temp.snmprec