diff --git a/openvpn/vpnunlimited/at_openvpn.ovpn b/openvpn/vpnunlimited/at.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/at_openvpn.ovpn
rename to openvpn/vpnunlimited/at.ovpn
diff --git a/openvpn/vpnunlimited/au-syd_openvpn.ovpn b/openvpn/vpnunlimited/au-syd.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/au-syd_openvpn.ovpn
rename to openvpn/vpnunlimited/au-syd.ovpn
diff --git a/openvpn/vpnunlimited/be_openvpn.ovpn b/openvpn/vpnunlimited/be.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/be_openvpn.ovpn
rename to openvpn/vpnunlimited/be.ovpn
diff --git a/openvpn/vpnunlimited/bg_openvpn.ovpn b/openvpn/vpnunlimited/bg.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/bg_openvpn.ovpn
rename to openvpn/vpnunlimited/bg.ovpn
diff --git a/openvpn/vpnunlimited/br_openvpn.ovpn b/openvpn/vpnunlimited/br.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/br_openvpn.ovpn
rename to openvpn/vpnunlimited/br.ovpn
diff --git a/openvpn/vpnunlimited/by_openvpn.ovpn b/openvpn/vpnunlimited/by.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/by_openvpn.ovpn
rename to openvpn/vpnunlimited/by.ovpn
diff --git a/openvpn/vpnunlimited/ca-tr_openvpn.ovpn b/openvpn/vpnunlimited/ca-tr.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/ca-tr_openvpn.ovpn
rename to openvpn/vpnunlimited/ca-tr.ovpn
diff --git a/openvpn/vpnunlimited/ca-vn_openvpn.ovpn b/openvpn/vpnunlimited/ca-vn.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/ca-vn_openvpn.ovpn
rename to openvpn/vpnunlimited/ca-vn.ovpn
diff --git a/openvpn/vpnunlimited/ca_openvpn.ovpn b/openvpn/vpnunlimited/ca.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/ca_openvpn.ovpn
rename to openvpn/vpnunlimited/ca.ovpn
diff --git a/openvpn/vpnunlimited/ch_openvpn.ovpn b/openvpn/vpnunlimited/ch.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/ch_openvpn.ovpn
rename to openvpn/vpnunlimited/ch.ovpn
diff --git a/openvpn/vpnunlimited/cl_openvpn.ovpn b/openvpn/vpnunlimited/cl.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/cl_openvpn.ovpn
rename to openvpn/vpnunlimited/cl.ovpn
diff --git a/openvpn/vpnunlimited/cy_openvpn.ovpn b/openvpn/vpnunlimited/cy.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/cy_openvpn.ovpn
rename to openvpn/vpnunlimited/cy.ovpn
diff --git a/openvpn/vpnunlimited/cz_openvpn.ovpn b/openvpn/vpnunlimited/cz.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/cz_openvpn.ovpn
rename to openvpn/vpnunlimited/cz.ovpn
diff --git a/openvpn/vpnunlimited/de-dus_openvpn.ovpn b/openvpn/vpnunlimited/de-dus.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/de-dus_openvpn.ovpn
rename to openvpn/vpnunlimited/de-dus.ovpn
diff --git a/openvpn/vpnunlimited/de_openvpn.ovpn b/openvpn/vpnunlimited/de.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/de_openvpn.ovpn
rename to openvpn/vpnunlimited/de.ovpn
diff --git a/openvpn/vpnunlimited/dk_openvpn.ovpn b/openvpn/vpnunlimited/dk.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/dk_openvpn.ovpn
rename to openvpn/vpnunlimited/dk.ovpn
diff --git a/openvpn/vpnunlimited/ee_openvpn.ovpn b/openvpn/vpnunlimited/ee.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/ee_openvpn.ovpn
rename to openvpn/vpnunlimited/ee.ovpn
diff --git a/openvpn/vpnunlimited/es_openvpn.ovpn b/openvpn/vpnunlimited/es.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/es_openvpn.ovpn
rename to openvpn/vpnunlimited/es.ovpn
diff --git a/openvpn/vpnunlimited/fi_openvpn.ovpn b/openvpn/vpnunlimited/fi.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/fi_openvpn.ovpn
rename to openvpn/vpnunlimited/fi.ovpn
diff --git a/openvpn/vpnunlimited/fr-sbg_openvpn.ovpn b/openvpn/vpnunlimited/fr-sbg.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/fr-sbg_openvpn.ovpn
rename to openvpn/vpnunlimited/fr-sbg.ovpn
diff --git a/openvpn/vpnunlimited/fr_openvpn.ovpn b/openvpn/vpnunlimited/fr.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/fr_openvpn.ovpn
rename to openvpn/vpnunlimited/fr.ovpn
diff --git a/openvpn/vpnunlimited/gr_openvpn.ovpn b/openvpn/vpnunlimited/gr.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/gr_openvpn.ovpn
rename to openvpn/vpnunlimited/gr.ovpn
diff --git a/openvpn/vpnunlimited/hr_openvpn.ovpn b/openvpn/vpnunlimited/hr.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/hr_openvpn.ovpn
rename to openvpn/vpnunlimited/hr.ovpn
diff --git a/openvpn/vpnunlimited/hu_openvpn.ovpn b/openvpn/vpnunlimited/hu.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/hu_openvpn.ovpn
rename to openvpn/vpnunlimited/hu.ovpn
diff --git a/openvpn/vpnunlimited/ie-dub_openvpn.ovpn b/openvpn/vpnunlimited/ie-dub.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/ie-dub_openvpn.ovpn
rename to openvpn/vpnunlimited/ie-dub.ovpn
diff --git a/openvpn/vpnunlimited/im_openvpn.ovpn b/openvpn/vpnunlimited/im.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/im_openvpn.ovpn
rename to openvpn/vpnunlimited/im.ovpn
diff --git a/openvpn/vpnunlimited/in-ka_openvpn.ovpn b/openvpn/vpnunlimited/in-ka.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/in-ka_openvpn.ovpn
rename to openvpn/vpnunlimited/in-ka.ovpn
diff --git a/openvpn/vpnunlimited/is_openvpn.ovpn b/openvpn/vpnunlimited/is.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/is_openvpn.ovpn
rename to openvpn/vpnunlimited/is.ovpn
diff --git a/openvpn/vpnunlimited/it-mil_openvpn.ovpn b/openvpn/vpnunlimited/it-mil.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/it-mil_openvpn.ovpn
rename to openvpn/vpnunlimited/it-mil.ovpn
diff --git a/openvpn/vpnunlimited/jp_openvpn.ovpn b/openvpn/vpnunlimited/jp.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/jp_openvpn.ovpn
rename to openvpn/vpnunlimited/jp.ovpn
diff --git a/openvpn/vpnunlimited/kr_openvpn.ovpn b/openvpn/vpnunlimited/kr.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/kr_openvpn.ovpn
rename to openvpn/vpnunlimited/kr.ovpn
diff --git a/openvpn/vpnunlimited/lt_openvpn.ovpn b/openvpn/vpnunlimited/lt.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/lt_openvpn.ovpn
rename to openvpn/vpnunlimited/lt.ovpn
diff --git a/openvpn/vpnunlimited/lu_openvpn.ovpn b/openvpn/vpnunlimited/lu.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/lu_openvpn.ovpn
rename to openvpn/vpnunlimited/lu.ovpn
diff --git a/openvpn/vpnunlimited/lv_openvpn.ovpn b/openvpn/vpnunlimited/lv.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/lv_openvpn.ovpn
rename to openvpn/vpnunlimited/lv.ovpn
diff --git a/openvpn/vpnunlimited/md_openvpn.ovpn b/openvpn/vpnunlimited/md.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/md_openvpn.ovpn
rename to openvpn/vpnunlimited/md.ovpn
diff --git a/openvpn/vpnunlimited/mx_openvpn.ovpn b/openvpn/vpnunlimited/mx.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/mx_openvpn.ovpn
rename to openvpn/vpnunlimited/mx.ovpn
diff --git a/openvpn/vpnunlimited/mys_openvpn.ovpn b/openvpn/vpnunlimited/mys.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/mys_openvpn.ovpn
rename to openvpn/vpnunlimited/mys.ovpn
diff --git a/openvpn/vpnunlimited/nl_openvpn.ovpn b/openvpn/vpnunlimited/nl.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/nl_openvpn.ovpn
rename to openvpn/vpnunlimited/nl.ovpn
diff --git a/openvpn/vpnunlimited/no_openvpn.ovpn b/openvpn/vpnunlimited/no.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/no_openvpn.ovpn
rename to openvpn/vpnunlimited/no.ovpn
diff --git a/openvpn/vpnunlimited/nz_openvpn.ovpn b/openvpn/vpnunlimited/nz.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/nz_openvpn.ovpn
rename to openvpn/vpnunlimited/nz.ovpn
diff --git a/openvpn/vpnunlimited/pl_openvpn.ovpn b/openvpn/vpnunlimited/pl.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/pl_openvpn.ovpn
rename to openvpn/vpnunlimited/pl.ovpn
diff --git a/openvpn/vpnunlimited/pt_openvpn.ovpn b/openvpn/vpnunlimited/pt.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/pt_openvpn.ovpn
rename to openvpn/vpnunlimited/pt.ovpn
diff --git a/openvpn/vpnunlimited/ro_openvpn.ovpn b/openvpn/vpnunlimited/ro.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/ro_openvpn.ovpn
rename to openvpn/vpnunlimited/ro.ovpn
diff --git a/openvpn/vpnunlimited/se_openvpn.ovpn b/openvpn/vpnunlimited/se.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/se_openvpn.ovpn
rename to openvpn/vpnunlimited/se.ovpn
diff --git a/openvpn/vpnunlimited/sg_openvpn.ovpn b/openvpn/vpnunlimited/sg.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/sg_openvpn.ovpn
rename to openvpn/vpnunlimited/sg.ovpn
diff --git a/openvpn/vpnunlimited/si_openvpn.ovpn b/openvpn/vpnunlimited/si.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/si_openvpn.ovpn
rename to openvpn/vpnunlimited/si.ovpn
diff --git a/openvpn/vpnunlimited/sk_openvpn.ovpn b/openvpn/vpnunlimited/sk.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/sk_openvpn.ovpn
rename to openvpn/vpnunlimited/sk.ovpn
diff --git a/openvpn/vpnunlimited/th_openvpn.ovpn b/openvpn/vpnunlimited/th.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/th_openvpn.ovpn
rename to openvpn/vpnunlimited/th.ovpn
diff --git a/openvpn/vpnunlimited/tr_openvpn.ovpn b/openvpn/vpnunlimited/tr.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/tr_openvpn.ovpn
rename to openvpn/vpnunlimited/tr.ovpn
diff --git a/openvpn/vpnunlimited/uk-bbc_openvpn.ovpn b/openvpn/vpnunlimited/uk-bbc.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/uk-bbc_openvpn.ovpn
rename to openvpn/vpnunlimited/uk-bbc.ovpn
diff --git a/openvpn/vpnunlimited/uk-cv_openvpn.ovpn b/openvpn/vpnunlimited/uk-cv.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/uk-cv_openvpn.ovpn
rename to openvpn/vpnunlimited/uk-cv.ovpn
diff --git a/openvpn/vpnunlimited/uk_openvpn.ovpn b/openvpn/vpnunlimited/uk.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/uk_openvpn.ovpn
rename to openvpn/vpnunlimited/uk.ovpn
diff --git a/openvpn/vpnunlimited/us-chi_openvpn.ovpn b/openvpn/vpnunlimited/us-chi.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-chi_openvpn.ovpn
rename to openvpn/vpnunlimited/us-chi.ovpn
diff --git a/openvpn/vpnunlimited/us-dal_openvpn.ovpn b/openvpn/vpnunlimited/us-dal.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-dal_openvpn.ovpn
rename to openvpn/vpnunlimited/us-dal.ovpn
diff --git a/openvpn/vpnunlimited/us-hou_openvpn.ovpn b/openvpn/vpnunlimited/us-hou.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-hou_openvpn.ovpn
rename to openvpn/vpnunlimited/us-hou.ovpn
diff --git a/openvpn/vpnunlimited/us-la_openvpn.ovpn b/openvpn/vpnunlimited/us-la.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-la_openvpn.ovpn
rename to openvpn/vpnunlimited/us-la.ovpn
diff --git a/openvpn/vpnunlimited/us-lv_openvpn.ovpn b/openvpn/vpnunlimited/us-lv.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-lv_openvpn.ovpn
rename to openvpn/vpnunlimited/us-lv.ovpn
diff --git a/openvpn/vpnunlimited/us-mia_openvpn.ovpn b/openvpn/vpnunlimited/us-mia.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-mia_openvpn.ovpn
rename to openvpn/vpnunlimited/us-mia.ovpn
diff --git a/openvpn/vpnunlimited/us-netflix_openvpn.ovpn b/openvpn/vpnunlimited/us-netflix.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-netflix_openvpn.ovpn
rename to openvpn/vpnunlimited/us-netflix.ovpn
diff --git a/openvpn/vpnunlimited/us-ny_openvpn.ovpn b/openvpn/vpnunlimited/us-ny.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-ny_openvpn.ovpn
rename to openvpn/vpnunlimited/us-ny.ovpn
diff --git a/openvpn/vpnunlimited/us-sea_openvpn.ovpn b/openvpn/vpnunlimited/us-sea.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-sea_openvpn.ovpn
rename to openvpn/vpnunlimited/us-sea.ovpn
diff --git a/openvpn/vpnunlimited/us-sf_openvpn.ovpn b/openvpn/vpnunlimited/us-sf.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-sf_openvpn.ovpn
rename to openvpn/vpnunlimited/us-sf.ovpn
diff --git a/openvpn/vpnunlimited/us-sl_openvpn.ovpn b/openvpn/vpnunlimited/us-sl.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-sl_openvpn.ovpn
rename to openvpn/vpnunlimited/us-sl.ovpn
diff --git a/openvpn/vpnunlimited/us-slc_openvpn.ovpn b/openvpn/vpnunlimited/us-slc.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-slc_openvpn.ovpn
rename to openvpn/vpnunlimited/us-slc.ovpn
diff --git a/openvpn/vpnunlimited/us-stream_openvpn.ovpn b/openvpn/vpnunlimited/us-stream.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us-stream_openvpn.ovpn
rename to openvpn/vpnunlimited/us-stream.ovpn
diff --git a/openvpn/vpnunlimited/us_openvpn.ovpn b/openvpn/vpnunlimited/us.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/us_openvpn.ovpn
rename to openvpn/vpnunlimited/us.ovpn
diff --git a/openvpn/vpnunlimited/vn_openvpn.ovpn b/openvpn/vpnunlimited/vn.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/vn_openvpn.ovpn
rename to openvpn/vpnunlimited/vn.ovpn
diff --git a/openvpn/vpnunlimited/za_openvpn.ovpn b/openvpn/vpnunlimited/za.ovpn
similarity index 100%
rename from openvpn/vpnunlimited/za_openvpn.ovpn
rename to openvpn/vpnunlimited/za.ovpn