diff --git a/drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map b/drivers/baseband/fpga_5gnr_fec/version.map
similarity index 100%
rename from drivers/baseband/fpga_5gnr_fec/rte_pmd_bbdev_fpga_5gnr_fec_version.map
rename to drivers/baseband/fpga_5gnr_fec/version.map
diff --git a/drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map b/drivers/baseband/fpga_lte_fec/version.map
similarity index 100%
rename from drivers/baseband/fpga_lte_fec/rte_pmd_bbdev_fpga_lte_fec_version.map
rename to drivers/baseband/fpga_lte_fec/version.map
diff --git a/drivers/baseband/null/rte_pmd_bbdev_null_version.map b/drivers/baseband/null/version.map
similarity index 100%
rename from drivers/baseband/null/rte_pmd_bbdev_null_version.map
rename to drivers/baseband/null/version.map
diff --git a/drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map b/drivers/baseband/turbo_sw/version.map
similarity index 100%
rename from drivers/baseband/turbo_sw/rte_pmd_bbdev_turbo_sw_version.map
rename to drivers/baseband/turbo_sw/version.map
diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/version.map
similarity index 100%
rename from drivers/bus/dpaa/rte_bus_dpaa_version.map
rename to drivers/bus/dpaa/version.map
diff --git a/drivers/bus/fslmc/rte_bus_fslmc_version.map b/drivers/bus/fslmc/version.map
similarity index 100%
rename from drivers/bus/fslmc/rte_bus_fslmc_version.map
rename to drivers/bus/fslmc/version.map
diff --git a/drivers/bus/ifpga/rte_bus_ifpga_version.map b/drivers/bus/ifpga/version.map
similarity index 100%
rename from drivers/bus/ifpga/rte_bus_ifpga_version.map
rename to drivers/bus/ifpga/version.map
diff --git a/drivers/bus/pci/rte_bus_pci_version.map b/drivers/bus/pci/version.map
similarity index 100%
rename from drivers/bus/pci/rte_bus_pci_version.map
rename to drivers/bus/pci/version.map
diff --git a/drivers/bus/vdev/rte_bus_vdev_version.map b/drivers/bus/vdev/version.map
similarity index 100%
rename from drivers/bus/vdev/rte_bus_vdev_version.map
rename to drivers/bus/vdev/version.map
diff --git a/drivers/bus/vmbus/rte_bus_vmbus_version.map b/drivers/bus/vmbus/version.map
similarity index 100%
rename from drivers/bus/vmbus/rte_bus_vmbus_version.map
rename to drivers/bus/vmbus/version.map
diff --git a/drivers/common/cpt/rte_common_cpt_version.map b/drivers/common/cpt/version.map
similarity index 100%
rename from drivers/common/cpt/rte_common_cpt_version.map
rename to drivers/common/cpt/version.map
diff --git a/drivers/common/dpaax/rte_common_dpaax_version.map b/drivers/common/dpaax/version.map
similarity index 100%
rename from drivers/common/dpaax/rte_common_dpaax_version.map
rename to drivers/common/dpaax/version.map
diff --git a/drivers/common/iavf/rte_common_iavf_version.map b/drivers/common/iavf/version.map
similarity index 100%
rename from drivers/common/iavf/rte_common_iavf_version.map
rename to drivers/common/iavf/version.map
diff --git a/drivers/common/mlx5/rte_common_mlx5_version.map b/drivers/common/mlx5/version.map
similarity index 100%
rename from drivers/common/mlx5/rte_common_mlx5_version.map
rename to drivers/common/mlx5/version.map
diff --git a/drivers/common/mvep/rte_common_mvep_version.map b/drivers/common/mvep/version.map
similarity index 100%
rename from drivers/common/mvep/rte_common_mvep_version.map
rename to drivers/common/mvep/version.map
diff --git a/drivers/common/octeontx/rte_common_octeontx_version.map b/drivers/common/octeontx/version.map
similarity index 100%
rename from drivers/common/octeontx/rte_common_octeontx_version.map
rename to drivers/common/octeontx/version.map
diff --git a/drivers/common/octeontx2/rte_common_octeontx2_version.map b/drivers/common/octeontx2/version.map
similarity index 100%
rename from drivers/common/octeontx2/rte_common_octeontx2_version.map
rename to drivers/common/octeontx2/version.map
diff --git a/drivers/common/qat/rte_common_qat_version.map b/drivers/common/qat/version.map
similarity index 100%
rename from drivers/common/qat/rte_common_qat_version.map
rename to drivers/common/qat/version.map
diff --git a/drivers/common/sfc_efx/rte_common_sfc_efx_version.map b/drivers/common/sfc_efx/version.map
similarity index 100%
rename from drivers/common/sfc_efx/rte_common_sfc_efx_version.map
rename to drivers/common/sfc_efx/version.map
diff --git a/drivers/compress/isal/rte_pmd_isal_version.map b/drivers/compress/isal/version.map
similarity index 100%
rename from drivers/compress/isal/rte_pmd_isal_version.map
rename to drivers/compress/isal/version.map
diff --git a/drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map b/drivers/compress/octeontx/version.map
similarity index 100%
rename from drivers/compress/octeontx/rte_pmd_octeontx_compress_version.map
rename to drivers/compress/octeontx/version.map
diff --git a/drivers/compress/zlib/rte_pmd_zlib_version.map b/drivers/compress/zlib/version.map
similarity index 100%
rename from drivers/compress/zlib/rte_pmd_zlib_version.map
rename to drivers/compress/zlib/version.map
diff --git a/drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map b/drivers/crypto/aesni_gcm/version.map
similarity index 100%
rename from drivers/crypto/aesni_gcm/rte_pmd_aesni_gcm_version.map
rename to drivers/crypto/aesni_gcm/version.map
diff --git a/drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map b/drivers/crypto/aesni_mb/version.map
similarity index 100%
rename from drivers/crypto/aesni_mb/rte_pmd_aesni_mb_version.map
rename to drivers/crypto/aesni_mb/version.map
diff --git a/drivers/crypto/armv8/rte_pmd_armv8_version.map b/drivers/crypto/armv8/version.map
similarity index 100%
rename from drivers/crypto/armv8/rte_pmd_armv8_version.map
rename to drivers/crypto/armv8/version.map
diff --git a/drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map b/drivers/crypto/caam_jr/version.map
similarity index 100%
rename from drivers/crypto/caam_jr/rte_pmd_caam_jr_version.map
rename to drivers/crypto/caam_jr/version.map
diff --git a/drivers/crypto/ccp/rte_pmd_ccp_version.map b/drivers/crypto/ccp/version.map
similarity index 100%
rename from drivers/crypto/ccp/rte_pmd_ccp_version.map
rename to drivers/crypto/ccp/version.map
diff --git a/drivers/crypto/dpaa2_sec/rte_pmd_dpaa2_sec_version.map b/drivers/crypto/dpaa2_sec/version.map
similarity index 100%
rename from drivers/crypto/dpaa2_sec/rte_pmd_dpaa2_sec_version.map
rename to drivers/crypto/dpaa2_sec/version.map
diff --git a/drivers/crypto/dpaa_sec/rte_pmd_dpaa_sec_version.map b/drivers/crypto/dpaa_sec/version.map
similarity index 100%
rename from drivers/crypto/dpaa_sec/rte_pmd_dpaa_sec_version.map
rename to drivers/crypto/dpaa_sec/version.map
diff --git a/drivers/crypto/kasumi/rte_pmd_kasumi_version.map b/drivers/crypto/kasumi/version.map
similarity index 100%
rename from drivers/crypto/kasumi/rte_pmd_kasumi_version.map
rename to drivers/crypto/kasumi/version.map
diff --git a/drivers/crypto/mvsam/rte_pmd_mvsam_version.map b/drivers/crypto/mvsam/version.map
similarity index 100%
rename from drivers/crypto/mvsam/rte_pmd_mvsam_version.map
rename to drivers/crypto/mvsam/version.map
diff --git a/drivers/crypto/nitrox/rte_pmd_nitrox_version.map b/drivers/crypto/nitrox/version.map
similarity index 100%
rename from drivers/crypto/nitrox/rte_pmd_nitrox_version.map
rename to drivers/crypto/nitrox/version.map
diff --git a/drivers/crypto/null/rte_pmd_null_crypto_version.map b/drivers/crypto/null/version.map
similarity index 100%
rename from drivers/crypto/null/rte_pmd_null_crypto_version.map
rename to drivers/crypto/null/version.map
diff --git a/drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map b/drivers/crypto/octeontx/version.map
similarity index 100%
rename from drivers/crypto/octeontx/rte_pmd_octeontx_crypto_version.map
rename to drivers/crypto/octeontx/version.map
diff --git a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map b/drivers/crypto/octeontx2/version.map
similarity index 100%
rename from drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
rename to drivers/crypto/octeontx2/version.map
diff --git a/drivers/crypto/openssl/rte_pmd_openssl_version.map b/drivers/crypto/openssl/version.map
similarity index 100%
rename from drivers/crypto/openssl/rte_pmd_openssl_version.map
rename to drivers/crypto/openssl/version.map
diff --git a/drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map b/drivers/crypto/scheduler/version.map
similarity index 100%
rename from drivers/crypto/scheduler/rte_pmd_crypto_scheduler_version.map
rename to drivers/crypto/scheduler/version.map
diff --git a/drivers/crypto/snow3g/rte_pmd_snow3g_version.map b/drivers/crypto/snow3g/version.map
similarity index 100%
rename from drivers/crypto/snow3g/rte_pmd_snow3g_version.map
rename to drivers/crypto/snow3g/version.map
diff --git a/drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map b/drivers/crypto/virtio/version.map
similarity index 100%
rename from drivers/crypto/virtio/rte_pmd_virtio_crypto_version.map
rename to drivers/crypto/virtio/version.map
diff --git a/drivers/crypto/zuc/rte_pmd_zuc_version.map b/drivers/crypto/zuc/version.map
similarity index 100%
rename from drivers/crypto/zuc/rte_pmd_zuc_version.map
rename to drivers/crypto/zuc/version.map
diff --git a/drivers/event/dpaa/rte_pmd_dpaa_event_version.map b/drivers/event/dpaa/version.map
similarity index 100%
rename from drivers/event/dpaa/rte_pmd_dpaa_event_version.map
rename to drivers/event/dpaa/version.map
diff --git a/drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map b/drivers/event/dpaa2/version.map
similarity index 100%
rename from drivers/event/dpaa2/rte_pmd_dpaa2_event_version.map
rename to drivers/event/dpaa2/version.map
diff --git a/drivers/event/dsw/rte_pmd_dsw_event_version.map b/drivers/event/dsw/version.map
similarity index 100%
rename from drivers/event/dsw/rte_pmd_dsw_event_version.map
rename to drivers/event/dsw/version.map
diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/version.map
similarity index 100%
rename from drivers/event/octeontx/rte_pmd_octeontx_event_version.map
rename to drivers/event/octeontx/version.map
diff --git a/drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map b/drivers/event/octeontx2/version.map
similarity index 100%
rename from drivers/event/octeontx2/rte_pmd_octeontx2_event_version.map
rename to drivers/event/octeontx2/version.map
diff --git a/drivers/event/opdl/rte_pmd_opdl_event_version.map b/drivers/event/opdl/version.map
similarity index 100%
rename from drivers/event/opdl/rte_pmd_opdl_event_version.map
rename to drivers/event/opdl/version.map
diff --git a/drivers/event/skeleton/rte_pmd_skeleton_event_version.map b/drivers/event/skeleton/version.map
similarity index 100%
rename from drivers/event/skeleton/rte_pmd_skeleton_event_version.map
rename to drivers/event/skeleton/version.map
diff --git a/drivers/event/sw/rte_pmd_sw_event_version.map b/drivers/event/sw/version.map
similarity index 100%
rename from drivers/event/sw/rte_pmd_sw_event_version.map
rename to drivers/event/sw/version.map
diff --git a/drivers/mempool/bucket/rte_mempool_bucket_version.map b/drivers/mempool/bucket/version.map
similarity index 100%
rename from drivers/mempool/bucket/rte_mempool_bucket_version.map
rename to drivers/mempool/bucket/version.map
diff --git a/drivers/mempool/dpaa/rte_mempool_dpaa_version.map b/drivers/mempool/dpaa/version.map
similarity index 100%
rename from drivers/mempool/dpaa/rte_mempool_dpaa_version.map
rename to drivers/mempool/dpaa/version.map
diff --git a/drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map b/drivers/mempool/dpaa2/version.map
similarity index 100%
rename from drivers/mempool/dpaa2/rte_mempool_dpaa2_version.map
rename to drivers/mempool/dpaa2/version.map
diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx_version.map b/drivers/mempool/octeontx/version.map
similarity index 100%
rename from drivers/mempool/octeontx/rte_mempool_octeontx_version.map
rename to drivers/mempool/octeontx/version.map
diff --git a/drivers/mempool/octeontx2/rte_mempool_octeontx2_version.map b/drivers/mempool/octeontx2/version.map
similarity index 100%
rename from drivers/mempool/octeontx2/rte_mempool_octeontx2_version.map
rename to drivers/mempool/octeontx2/version.map
diff --git a/drivers/mempool/ring/rte_mempool_ring_version.map b/drivers/mempool/ring/version.map
similarity index 100%
rename from drivers/mempool/ring/rte_mempool_ring_version.map
rename to drivers/mempool/ring/version.map
diff --git a/drivers/mempool/stack/rte_mempool_stack_version.map b/drivers/mempool/stack/version.map
similarity index 100%
rename from drivers/mempool/stack/rte_mempool_stack_version.map
rename to drivers/mempool/stack/version.map
diff --git a/drivers/meson.build b/drivers/meson.build
index b95b00583..3d4bbff13 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -166,9 +166,9 @@ foreach subpath:subdirs
 				install: true)
 
 			# now build the shared driver
-			version_map = '@0@/@1@/@2@_version.map'.format(
+			version_map = '@0@/@1@/version.map'.format(
 					meson.current_source_dir(),
-					drv_path, lib_name)
+					drv_path)
 			implib = 'lib' + lib_name + '.dll.a'
 
 			def_file = custom_target(lib_name + '_def',
diff --git a/drivers/net/af_packet/rte_pmd_af_packet_version.map b/drivers/net/af_packet/version.map
similarity index 100%
rename from drivers/net/af_packet/rte_pmd_af_packet_version.map
rename to drivers/net/af_packet/version.map
diff --git a/drivers/net/af_xdp/rte_pmd_af_xdp_version.map b/drivers/net/af_xdp/version.map
similarity index 100%
rename from drivers/net/af_xdp/rte_pmd_af_xdp_version.map
rename to drivers/net/af_xdp/version.map
diff --git a/drivers/net/ark/rte_pmd_ark_version.map b/drivers/net/ark/version.map
similarity index 100%
rename from drivers/net/ark/rte_pmd_ark_version.map
rename to drivers/net/ark/version.map
diff --git a/drivers/net/atlantic/rte_pmd_atlantic_version.map b/drivers/net/atlantic/version.map
similarity index 100%
rename from drivers/net/atlantic/rte_pmd_atlantic_version.map
rename to drivers/net/atlantic/version.map
diff --git a/drivers/net/avp/rte_pmd_avp_version.map b/drivers/net/avp/version.map
similarity index 100%
rename from drivers/net/avp/rte_pmd_avp_version.map
rename to drivers/net/avp/version.map
diff --git a/drivers/net/axgbe/rte_pmd_axgbe_version.map b/drivers/net/axgbe/version.map
similarity index 100%
rename from drivers/net/axgbe/rte_pmd_axgbe_version.map
rename to drivers/net/axgbe/version.map
diff --git a/drivers/net/bnx2x/rte_pmd_bnx2x_version.map b/drivers/net/bnx2x/version.map
similarity index 100%
rename from drivers/net/bnx2x/rte_pmd_bnx2x_version.map
rename to drivers/net/bnx2x/version.map
diff --git a/drivers/net/bnxt/rte_pmd_bnxt_version.map b/drivers/net/bnxt/version.map
similarity index 100%
rename from drivers/net/bnxt/rte_pmd_bnxt_version.map
rename to drivers/net/bnxt/version.map
diff --git a/drivers/net/bonding/rte_pmd_bond_version.map b/drivers/net/bonding/version.map
similarity index 100%
rename from drivers/net/bonding/rte_pmd_bond_version.map
rename to drivers/net/bonding/version.map
diff --git a/drivers/net/cxgbe/rte_pmd_cxgbe_version.map b/drivers/net/cxgbe/version.map
similarity index 100%
rename from drivers/net/cxgbe/rte_pmd_cxgbe_version.map
rename to drivers/net/cxgbe/version.map
diff --git a/drivers/net/dpaa/rte_pmd_dpaa_version.map b/drivers/net/dpaa/version.map
similarity index 100%
rename from drivers/net/dpaa/rte_pmd_dpaa_version.map
rename to drivers/net/dpaa/version.map
diff --git a/drivers/net/dpaa2/rte_pmd_dpaa2_version.map b/drivers/net/dpaa2/version.map
similarity index 100%
rename from drivers/net/dpaa2/rte_pmd_dpaa2_version.map
rename to drivers/net/dpaa2/version.map
diff --git a/drivers/net/e1000/rte_pmd_e1000_version.map b/drivers/net/e1000/version.map
similarity index 100%
rename from drivers/net/e1000/rte_pmd_e1000_version.map
rename to drivers/net/e1000/version.map
diff --git a/drivers/net/ena/rte_pmd_ena_version.map b/drivers/net/ena/version.map
similarity index 100%
rename from drivers/net/ena/rte_pmd_ena_version.map
rename to drivers/net/ena/version.map
diff --git a/drivers/net/enetc/rte_pmd_enetc_version.map b/drivers/net/enetc/version.map
similarity index 100%
rename from drivers/net/enetc/rte_pmd_enetc_version.map
rename to drivers/net/enetc/version.map
diff --git a/drivers/net/enic/rte_pmd_enic_version.map b/drivers/net/enic/version.map
similarity index 100%
rename from drivers/net/enic/rte_pmd_enic_version.map
rename to drivers/net/enic/version.map
diff --git a/drivers/net/failsafe/rte_pmd_failsafe_version.map b/drivers/net/failsafe/version.map
similarity index 100%
rename from drivers/net/failsafe/rte_pmd_failsafe_version.map
rename to drivers/net/failsafe/version.map
diff --git a/drivers/net/fm10k/rte_pmd_fm10k_version.map b/drivers/net/fm10k/version.map
similarity index 100%
rename from drivers/net/fm10k/rte_pmd_fm10k_version.map
rename to drivers/net/fm10k/version.map
diff --git a/drivers/net/hinic/rte_pmd_hinic_version.map b/drivers/net/hinic/version.map
similarity index 100%
rename from drivers/net/hinic/rte_pmd_hinic_version.map
rename to drivers/net/hinic/version.map
diff --git a/drivers/net/hns3/rte_pmd_hns3_version.map b/drivers/net/hns3/version.map
similarity index 100%
rename from drivers/net/hns3/rte_pmd_hns3_version.map
rename to drivers/net/hns3/version.map
diff --git a/drivers/net/i40e/rte_pmd_i40e_version.map b/drivers/net/i40e/version.map
similarity index 100%
rename from drivers/net/i40e/rte_pmd_i40e_version.map
rename to drivers/net/i40e/version.map
diff --git a/drivers/net/iavf/rte_pmd_iavf_version.map b/drivers/net/iavf/version.map
similarity index 100%
rename from drivers/net/iavf/rte_pmd_iavf_version.map
rename to drivers/net/iavf/version.map
diff --git a/drivers/net/ice/rte_pmd_ice_version.map b/drivers/net/ice/version.map
similarity index 100%
rename from drivers/net/ice/rte_pmd_ice_version.map
rename to drivers/net/ice/version.map
diff --git a/drivers/net/igc/rte_pmd_igc_version.map b/drivers/net/igc/version.map
similarity index 100%
rename from drivers/net/igc/rte_pmd_igc_version.map
rename to drivers/net/igc/version.map
diff --git a/drivers/net/ionic/rte_pmd_ionic_version.map b/drivers/net/ionic/version.map
similarity index 100%
rename from drivers/net/ionic/rte_pmd_ionic_version.map
rename to drivers/net/ionic/version.map
diff --git a/drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map b/drivers/net/ipn3ke/version.map
similarity index 100%
rename from drivers/net/ipn3ke/rte_pmd_ipn3ke_version.map
rename to drivers/net/ipn3ke/version.map
diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe_version.map b/drivers/net/ixgbe/version.map
similarity index 100%
rename from drivers/net/ixgbe/rte_pmd_ixgbe_version.map
rename to drivers/net/ixgbe/version.map
diff --git a/drivers/net/kni/rte_pmd_kni_version.map b/drivers/net/kni/version.map
similarity index 100%
rename from drivers/net/kni/rte_pmd_kni_version.map
rename to drivers/net/kni/version.map
diff --git a/drivers/net/liquidio/rte_pmd_liquidio_version.map b/drivers/net/liquidio/version.map
similarity index 100%
rename from drivers/net/liquidio/rte_pmd_liquidio_version.map
rename to drivers/net/liquidio/version.map
diff --git a/drivers/net/memif/rte_pmd_memif_version.map b/drivers/net/memif/version.map
similarity index 100%
rename from drivers/net/memif/rte_pmd_memif_version.map
rename to drivers/net/memif/version.map
diff --git a/drivers/net/mlx4/rte_pmd_mlx4_version.map b/drivers/net/mlx4/version.map
similarity index 100%
rename from drivers/net/mlx4/rte_pmd_mlx4_version.map
rename to drivers/net/mlx4/version.map
diff --git a/drivers/net/mlx5/rte_pmd_mlx5_version.map b/drivers/net/mlx5/version.map
similarity index 100%
rename from drivers/net/mlx5/rte_pmd_mlx5_version.map
rename to drivers/net/mlx5/version.map
diff --git a/drivers/net/mvneta/rte_pmd_mvneta_version.map b/drivers/net/mvneta/version.map
similarity index 100%
rename from drivers/net/mvneta/rte_pmd_mvneta_version.map
rename to drivers/net/mvneta/version.map
diff --git a/drivers/net/mvpp2/rte_pmd_mvpp2_version.map b/drivers/net/mvpp2/version.map
similarity index 100%
rename from drivers/net/mvpp2/rte_pmd_mvpp2_version.map
rename to drivers/net/mvpp2/version.map
diff --git a/drivers/net/netvsc/rte_pmd_netvsc_version.map b/drivers/net/netvsc/version.map
similarity index 100%
rename from drivers/net/netvsc/rte_pmd_netvsc_version.map
rename to drivers/net/netvsc/version.map
diff --git a/drivers/net/nfb/rte_pmd_nfb_version.map b/drivers/net/nfb/version.map
similarity index 100%
rename from drivers/net/nfb/rte_pmd_nfb_version.map
rename to drivers/net/nfb/version.map
diff --git a/drivers/net/nfp/rte_pmd_nfp_version.map b/drivers/net/nfp/version.map
similarity index 100%
rename from drivers/net/nfp/rte_pmd_nfp_version.map
rename to drivers/net/nfp/version.map
diff --git a/drivers/net/null/rte_pmd_null_version.map b/drivers/net/null/version.map
similarity index 100%
rename from drivers/net/null/rte_pmd_null_version.map
rename to drivers/net/null/version.map
diff --git a/drivers/net/octeontx/rte_pmd_octeontx_version.map b/drivers/net/octeontx/version.map
similarity index 100%
rename from drivers/net/octeontx/rte_pmd_octeontx_version.map
rename to drivers/net/octeontx/version.map
diff --git a/drivers/net/octeontx2/rte_pmd_octeontx2_version.map b/drivers/net/octeontx2/version.map
similarity index 100%
rename from drivers/net/octeontx2/rte_pmd_octeontx2_version.map
rename to drivers/net/octeontx2/version.map
diff --git a/drivers/net/pcap/rte_pmd_pcap_version.map b/drivers/net/pcap/version.map
similarity index 100%
rename from drivers/net/pcap/rte_pmd_pcap_version.map
rename to drivers/net/pcap/version.map
diff --git a/drivers/net/pfe/rte_pmd_pfe_version.map b/drivers/net/pfe/version.map
similarity index 100%
rename from drivers/net/pfe/rte_pmd_pfe_version.map
rename to drivers/net/pfe/version.map
diff --git a/drivers/net/qede/rte_pmd_qede_version.map b/drivers/net/qede/version.map
similarity index 100%
rename from drivers/net/qede/rte_pmd_qede_version.map
rename to drivers/net/qede/version.map
diff --git a/drivers/net/ring/rte_pmd_ring_version.map b/drivers/net/ring/version.map
similarity index 100%
rename from drivers/net/ring/rte_pmd_ring_version.map
rename to drivers/net/ring/version.map
diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/version.map
similarity index 100%
rename from drivers/net/sfc/rte_pmd_sfc_version.map
rename to drivers/net/sfc/version.map
diff --git a/drivers/net/softnic/rte_pmd_softnic_version.map b/drivers/net/softnic/version.map
similarity index 100%
rename from drivers/net/softnic/rte_pmd_softnic_version.map
rename to drivers/net/softnic/version.map
diff --git a/drivers/net/szedata2/rte_pmd_szedata2_version.map b/drivers/net/szedata2/version.map
similarity index 100%
rename from drivers/net/szedata2/rte_pmd_szedata2_version.map
rename to drivers/net/szedata2/version.map
diff --git a/drivers/net/tap/rte_pmd_tap_version.map b/drivers/net/tap/version.map
similarity index 100%
rename from drivers/net/tap/rte_pmd_tap_version.map
rename to drivers/net/tap/version.map
diff --git a/drivers/net/thunderx/rte_pmd_thunderx_version.map b/drivers/net/thunderx/version.map
similarity index 100%
rename from drivers/net/thunderx/rte_pmd_thunderx_version.map
rename to drivers/net/thunderx/version.map
diff --git a/drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map b/drivers/net/vdev_netvsc/version.map
similarity index 100%
rename from drivers/net/vdev_netvsc/rte_pmd_vdev_netvsc_version.map
rename to drivers/net/vdev_netvsc/version.map
diff --git a/drivers/net/vhost/rte_pmd_vhost_version.map b/drivers/net/vhost/version.map
similarity index 100%
rename from drivers/net/vhost/rte_pmd_vhost_version.map
rename to drivers/net/vhost/version.map
diff --git a/drivers/net/virtio/rte_pmd_virtio_version.map b/drivers/net/virtio/version.map
similarity index 100%
rename from drivers/net/virtio/rte_pmd_virtio_version.map
rename to drivers/net/virtio/version.map
diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/version.map
similarity index 100%
rename from drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
rename to drivers/net/vmxnet3/version.map
diff --git a/drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map b/drivers/raw/dpaa2_cmdif/version.map
similarity index 100%
rename from drivers/raw/dpaa2_cmdif/rte_rawdev_dpaa2_cmdif_version.map
rename to drivers/raw/dpaa2_cmdif/version.map
diff --git a/drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map b/drivers/raw/dpaa2_qdma/version.map
similarity index 100%
rename from drivers/raw/dpaa2_qdma/rte_rawdev_dpaa2_qdma_version.map
rename to drivers/raw/dpaa2_qdma/version.map
diff --git a/drivers/raw/ifpga/rte_rawdev_ifpga_version.map b/drivers/raw/ifpga/version.map
similarity index 100%
rename from drivers/raw/ifpga/rte_rawdev_ifpga_version.map
rename to drivers/raw/ifpga/version.map
diff --git a/drivers/raw/ioat/rte_rawdev_ioat_version.map b/drivers/raw/ioat/version.map
similarity index 100%
rename from drivers/raw/ioat/rte_rawdev_ioat_version.map
rename to drivers/raw/ioat/version.map
diff --git a/drivers/raw/ntb/rte_rawdev_ntb_version.map b/drivers/raw/ntb/version.map
similarity index 100%
rename from drivers/raw/ntb/rte_rawdev_ntb_version.map
rename to drivers/raw/ntb/version.map
diff --git a/drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map b/drivers/raw/octeontx2_dma/version.map
similarity index 100%
rename from drivers/raw/octeontx2_dma/rte_rawdev_octeontx2_dma_version.map
rename to drivers/raw/octeontx2_dma/version.map
diff --git a/drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map b/drivers/raw/octeontx2_ep/version.map
similarity index 100%
rename from drivers/raw/octeontx2_ep/rte_rawdev_octeontx2_ep_version.map
rename to drivers/raw/octeontx2_ep/version.map
diff --git a/drivers/raw/skeleton/rte_rawdev_skeleton_version.map b/drivers/raw/skeleton/version.map
similarity index 100%
rename from drivers/raw/skeleton/rte_rawdev_skeleton_version.map
rename to drivers/raw/skeleton/version.map
diff --git a/drivers/regex/mlx5/rte_pmd_mlx5_regex_version.map b/drivers/regex/mlx5/version.map
similarity index 100%
rename from drivers/regex/mlx5/rte_pmd_mlx5_regex_version.map
rename to drivers/regex/mlx5/version.map
diff --git a/drivers/regex/octeontx2/rte_pmd_octeontx2_regex_version.map b/drivers/regex/octeontx2/version.map
similarity index 100%
rename from drivers/regex/octeontx2/rte_pmd_octeontx2_regex_version.map
rename to drivers/regex/octeontx2/version.map
diff --git a/drivers/vdpa/ifc/rte_pmd_ifc_version.map b/drivers/vdpa/ifc/version.map
similarity index 100%
rename from drivers/vdpa/ifc/rte_pmd_ifc_version.map
rename to drivers/vdpa/ifc/version.map
diff --git a/drivers/vdpa/mlx5/rte_pmd_mlx5_vdpa_version.map b/drivers/vdpa/mlx5/version.map
similarity index 100%
rename from drivers/vdpa/mlx5/rte_pmd_mlx5_vdpa_version.map
rename to drivers/vdpa/mlx5/version.map
diff --git a/lib/librte_acl/rte_acl_version.map b/lib/librte_acl/version.map
similarity index 100%
rename from lib/librte_acl/rte_acl_version.map
rename to lib/librte_acl/version.map
diff --git a/lib/librte_bbdev/rte_bbdev_version.map b/lib/librte_bbdev/version.map
similarity index 100%
rename from lib/librte_bbdev/rte_bbdev_version.map
rename to lib/librte_bbdev/version.map
diff --git a/lib/librte_bitratestats/rte_bitratestats_version.map b/lib/librte_bitratestats/version.map
similarity index 100%
rename from lib/librte_bitratestats/rte_bitratestats_version.map
rename to lib/librte_bitratestats/version.map
diff --git a/lib/librte_bpf/rte_bpf_version.map b/lib/librte_bpf/version.map
similarity index 100%
rename from lib/librte_bpf/rte_bpf_version.map
rename to lib/librte_bpf/version.map
diff --git a/lib/librte_cfgfile/rte_cfgfile_version.map b/lib/librte_cfgfile/version.map
similarity index 100%
rename from lib/librte_cfgfile/rte_cfgfile_version.map
rename to lib/librte_cfgfile/version.map
diff --git a/lib/librte_cmdline/rte_cmdline_version.map b/lib/librte_cmdline/version.map
similarity index 100%
rename from lib/librte_cmdline/rte_cmdline_version.map
rename to lib/librte_cmdline/version.map
diff --git a/lib/librte_compressdev/rte_compressdev_version.map b/lib/librte_compressdev/version.map
similarity index 100%
rename from lib/librte_compressdev/rte_compressdev_version.map
rename to lib/librte_compressdev/version.map
diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/version.map
similarity index 100%
rename from lib/librte_cryptodev/rte_cryptodev_version.map
rename to lib/librte_cryptodev/version.map
diff --git a/lib/librte_distributor/rte_distributor_version.map b/lib/librte_distributor/version.map
similarity index 100%
rename from lib/librte_distributor/rte_distributor_version.map
rename to lib/librte_distributor/version.map
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/version.map
similarity index 100%
rename from lib/librte_eal/rte_eal_version.map
rename to lib/librte_eal/version.map
diff --git a/lib/librte_efd/rte_efd_version.map b/lib/librte_efd/version.map
similarity index 100%
rename from lib/librte_efd/rte_efd_version.map
rename to lib/librte_efd/version.map
diff --git a/lib/librte_ethdev/rte_ethdev_version.map b/lib/librte_ethdev/version.map
similarity index 100%
rename from lib/librte_ethdev/rte_ethdev_version.map
rename to lib/librte_ethdev/version.map
diff --git a/lib/librte_eventdev/rte_eventdev_version.map b/lib/librte_eventdev/version.map
similarity index 100%
rename from lib/librte_eventdev/rte_eventdev_version.map
rename to lib/librte_eventdev/version.map
diff --git a/lib/librte_fib/rte_fib_version.map b/lib/librte_fib/version.map
similarity index 100%
rename from lib/librte_fib/rte_fib_version.map
rename to lib/librte_fib/version.map
diff --git a/lib/librte_flow_classify/rte_flow_classify_version.map b/lib/librte_flow_classify/version.map
similarity index 100%
rename from lib/librte_flow_classify/rte_flow_classify_version.map
rename to lib/librte_flow_classify/version.map
diff --git a/lib/librte_graph/rte_graph_version.map b/lib/librte_graph/version.map
similarity index 100%
rename from lib/librte_graph/rte_graph_version.map
rename to lib/librte_graph/version.map
diff --git a/lib/librte_gro/rte_gro_version.map b/lib/librte_gro/version.map
similarity index 100%
rename from lib/librte_gro/rte_gro_version.map
rename to lib/librte_gro/version.map
diff --git a/lib/librte_gso/rte_gso_version.map b/lib/librte_gso/version.map
similarity index 100%
rename from lib/librte_gso/rte_gso_version.map
rename to lib/librte_gso/version.map
diff --git a/lib/librte_hash/rte_hash_version.map b/lib/librte_hash/version.map
similarity index 100%
rename from lib/librte_hash/rte_hash_version.map
rename to lib/librte_hash/version.map
diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_frag/version.map
similarity index 100%
rename from lib/librte_ip_frag/rte_ip_frag_version.map
rename to lib/librte_ip_frag/version.map
diff --git a/lib/librte_ipsec/rte_ipsec_version.map b/lib/librte_ipsec/version.map
similarity index 100%
rename from lib/librte_ipsec/rte_ipsec_version.map
rename to lib/librte_ipsec/version.map
diff --git a/lib/librte_jobstats/rte_jobstats_version.map b/lib/librte_jobstats/version.map
similarity index 100%
rename from lib/librte_jobstats/rte_jobstats_version.map
rename to lib/librte_jobstats/version.map
diff --git a/lib/librte_kni/rte_kni_version.map b/lib/librte_kni/version.map
similarity index 100%
rename from lib/librte_kni/rte_kni_version.map
rename to lib/librte_kni/version.map
diff --git a/lib/librte_kvargs/rte_kvargs_version.map b/lib/librte_kvargs/version.map
similarity index 100%
rename from lib/librte_kvargs/rte_kvargs_version.map
rename to lib/librte_kvargs/version.map
diff --git a/lib/librte_latencystats/rte_latencystats_version.map b/lib/librte_latencystats/version.map
similarity index 100%
rename from lib/librte_latencystats/rte_latencystats_version.map
rename to lib/librte_latencystats/version.map
diff --git a/lib/librte_lpm/rte_lpm_version.map b/lib/librte_lpm/version.map
similarity index 100%
rename from lib/librte_lpm/rte_lpm_version.map
rename to lib/librte_lpm/version.map
diff --git a/lib/librte_mbuf/rte_mbuf_version.map b/lib/librte_mbuf/version.map
similarity index 100%
rename from lib/librte_mbuf/rte_mbuf_version.map
rename to lib/librte_mbuf/version.map
diff --git a/lib/librte_member/rte_member_version.map b/lib/librte_member/version.map
similarity index 100%
rename from lib/librte_member/rte_member_version.map
rename to lib/librte_member/version.map
diff --git a/lib/librte_mempool/rte_mempool_version.map b/lib/librte_mempool/version.map
similarity index 100%
rename from lib/librte_mempool/rte_mempool_version.map
rename to lib/librte_mempool/version.map
diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/version.map
similarity index 100%
rename from lib/librte_meter/rte_meter_version.map
rename to lib/librte_meter/version.map
diff --git a/lib/librte_metrics/rte_metrics_version.map b/lib/librte_metrics/version.map
similarity index 100%
rename from lib/librte_metrics/rte_metrics_version.map
rename to lib/librte_metrics/version.map
diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/version.map
similarity index 100%
rename from lib/librte_net/rte_net_version.map
rename to lib/librte_net/version.map
diff --git a/lib/librte_node/rte_node_version.map b/lib/librte_node/version.map
similarity index 100%
rename from lib/librte_node/rte_node_version.map
rename to lib/librte_node/version.map
diff --git a/lib/librte_pci/rte_pci_version.map b/lib/librte_pci/version.map
similarity index 100%
rename from lib/librte_pci/rte_pci_version.map
rename to lib/librte_pci/version.map
diff --git a/lib/librte_pdump/rte_pdump_version.map b/lib/librte_pdump/version.map
similarity index 100%
rename from lib/librte_pdump/rte_pdump_version.map
rename to lib/librte_pdump/version.map
diff --git a/lib/librte_pipeline/rte_pipeline_version.map b/lib/librte_pipeline/version.map
similarity index 100%
rename from lib/librte_pipeline/rte_pipeline_version.map
rename to lib/librte_pipeline/version.map
diff --git a/lib/librte_port/rte_port_version.map b/lib/librte_port/version.map
similarity index 100%
rename from lib/librte_port/rte_port_version.map
rename to lib/librte_port/version.map
diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/version.map
similarity index 100%
rename from lib/librte_power/rte_power_version.map
rename to lib/librte_power/version.map
diff --git a/lib/librte_rawdev/rte_rawdev_version.map b/lib/librte_rawdev/version.map
similarity index 100%
rename from lib/librte_rawdev/rte_rawdev_version.map
rename to lib/librte_rawdev/version.map
diff --git a/lib/librte_rcu/rte_rcu_version.map b/lib/librte_rcu/version.map
similarity index 100%
rename from lib/librte_rcu/rte_rcu_version.map
rename to lib/librte_rcu/version.map
diff --git a/lib/librte_regexdev/rte_regexdev_version.map b/lib/librte_regexdev/version.map
similarity index 100%
rename from lib/librte_regexdev/rte_regexdev_version.map
rename to lib/librte_regexdev/version.map
diff --git a/lib/librte_reorder/rte_reorder_version.map b/lib/librte_reorder/version.map
similarity index 100%
rename from lib/librte_reorder/rte_reorder_version.map
rename to lib/librte_reorder/version.map
diff --git a/lib/librte_rib/rte_rib_version.map b/lib/librte_rib/version.map
similarity index 100%
rename from lib/librte_rib/rte_rib_version.map
rename to lib/librte_rib/version.map
diff --git a/lib/librte_ring/rte_ring_version.map b/lib/librte_ring/version.map
similarity index 100%
rename from lib/librte_ring/rte_ring_version.map
rename to lib/librte_ring/version.map
diff --git a/lib/librte_sched/rte_sched_version.map b/lib/librte_sched/version.map
similarity index 100%
rename from lib/librte_sched/rte_sched_version.map
rename to lib/librte_sched/version.map
diff --git a/lib/librte_security/rte_security_version.map b/lib/librte_security/version.map
similarity index 100%
rename from lib/librte_security/rte_security_version.map
rename to lib/librte_security/version.map
diff --git a/lib/librte_stack/rte_stack_version.map b/lib/librte_stack/version.map
similarity index 100%
rename from lib/librte_stack/rte_stack_version.map
rename to lib/librte_stack/version.map
diff --git a/lib/librte_table/rte_table_version.map b/lib/librte_table/version.map
similarity index 100%
rename from lib/librte_table/rte_table_version.map
rename to lib/librte_table/version.map
diff --git a/lib/librte_telemetry/rte_telemetry_version.map b/lib/librte_telemetry/version.map
similarity index 100%
rename from lib/librte_telemetry/rte_telemetry_version.map
rename to lib/librte_telemetry/version.map
diff --git a/lib/librte_timer/rte_timer_version.map b/lib/librte_timer/version.map
similarity index 100%
rename from lib/librte_timer/rte_timer_version.map
rename to lib/librte_timer/version.map
diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/version.map
similarity index 100%
rename from lib/librte_vhost/rte_vhost_version.map
rename to lib/librte_vhost/version.map
diff --git a/lib/meson.build b/lib/meson.build
index e5597f174..8761457c9 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -139,8 +139,8 @@ foreach l:libraries
 				# RTE_BUILD_SHARED_LIB defined
 				cflags += '-DRTE_BUILD_SHARED_LIB'
 			endif
-			version_map = '@0@/@1@/rte_@2@_version.map'.format(
-					meson.current_source_dir(), dir_name, name)
+			version_map = '@0@/@1@/version.map'.format(
+					meson.current_source_dir(), dir_name)
 			implib = dir_name + '.dll.a'
 
 			def_file = custom_target(libname + '_def',
