diff --git a/MAINTAINERS b/MAINTAINERS
index 26d3a7077c..08e575faac 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -812,9 +812,9 @@ M: Radha Mohan Chintakuntla <radhac@marvell.com>
 M: Veerasenareddy Burru <vburru@marvell.com>
 M: Sathesh Edara <sedara@marvell.com>
 T: git://dpdk.org/next/dpdk-next-net-mrvl
-F: drivers/net/octeontx_ep/
-F: doc/guides/nics/features/octeontx_ep.ini
-F: doc/guides/nics/octeontx_ep.rst
+F: drivers/net/octeon_ep/
+F: doc/guides/nics/features/octeon_ep.ini
+F: doc/guides/nics/octeon_ep.rst
 
 Mellanox mlx4
 M: Matan Azrad <matan@nvidia.com>
diff --git a/doc/guides/nics/features/octeontx_ep.ini b/doc/guides/nics/features/octeon_ep.ini
similarity index 75%
rename from doc/guides/nics/features/octeontx_ep.ini
rename to doc/guides/nics/features/octeon_ep.ini
index d1453f5bee..141d918466 100644
--- a/doc/guides/nics/features/octeontx_ep.ini
+++ b/doc/guides/nics/features/octeon_ep.ini
@@ -1,5 +1,5 @@
 ;
-; Supported features of the 'octeontx_ep' network poll mode driver.
+; Supported features of the 'octeon_ep' network poll mode driver.
 ;
 ; Refer to default.ini for the full list of available PMD features.
 ;
diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index f48e9f815c..f80906a97d 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -52,7 +52,7 @@ Network Interface Controller Drivers
     ngbe
     null
     octeontx
-    octeontx_ep
+    octeon_ep
     pfe
     qede
     sfc_efx
diff --git a/doc/guides/nics/octeontx_ep.rst b/doc/guides/nics/octeon_ep.rst
similarity index 87%
rename from doc/guides/nics/octeontx_ep.rst
rename to doc/guides/nics/octeon_ep.rst
index 2ec8a034b5..b5040aeee2 100644
--- a/doc/guides/nics/octeontx_ep.rst
+++ b/doc/guides/nics/octeon_ep.rst
@@ -4,9 +4,9 @@
 OCTEON TX EP Poll Mode driver
 =============================
 
-The OCTEON TX EP ETHDEV PMD (**librte_pmd_octeontx_ep**) provides poll mode
+The OCTEON TX EP ETHDEV PMD (**librte_pmd_octeon_ep**) provides poll mode
 ethdev driver support for the virtual functions (VF) of **Marvell OCTEON 9**
-and **Cavium OCTEON TX** families of adapters in SR-IOV context.
+and **Cavium OCTEON** families of adapters in SR-IOV context.
 
 More information can be found at `Marvell Official Website
 <https://www.marvell.com/content/dam/marvell/en/public-collateral/embedded-processors/marvell-liquidio-III-solutions-brief.pdf>`_.
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index fb8e755f15..985ef89877 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -207,11 +207,6 @@ Deprecation Notices
   Names for the telemetry commands will be similarly limited.
   The parameters for telemetry commands are unaffected by this change.
 
-* net/octeontx_ep: The driver ``octeontx_ep`` was to support OCTEON TX
-  line of products.
-  It will be renamed to ``octeon_ep`` in DPDK 22.11 to apply for
-  all OCTEON EP products: OCTEON TX and future OCTEON chipsets.
-
 * raw/dpaa2_cmdif: The ``dpaa2_cmdif`` rawdev driver will be deprecated
   in DPDK 22.11, as it is no longer in use, no active user known.
 
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index e35652fe63..37919eaf8b 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -45,7 +45,7 @@ drivers = [
         'ngbe',
         'null',
         'octeontx',
-        'octeontx_ep',
+        'octeon_ep',
         'pcap',
         'pfe',
         'qede',
diff --git a/drivers/net/octeontx_ep/meson.build b/drivers/net/octeon_ep/meson.build
similarity index 100%
rename from drivers/net/octeontx_ep/meson.build
rename to drivers/net/octeon_ep/meson.build
diff --git a/drivers/net/octeontx_ep/otx2_ep_vf.c b/drivers/net/octeon_ep/otx2_ep_vf.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx2_ep_vf.c
rename to drivers/net/octeon_ep/otx2_ep_vf.c
diff --git a/drivers/net/octeontx_ep/otx2_ep_vf.h b/drivers/net/octeon_ep/otx2_ep_vf.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx2_ep_vf.h
rename to drivers/net/octeon_ep/otx2_ep_vf.h
diff --git a/drivers/net/octeontx_ep/otx_ep_common.h b/drivers/net/octeon_ep/otx_ep_common.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_common.h
rename to drivers/net/octeon_ep/otx_ep_common.h
diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_ethdev.c
rename to drivers/net/octeon_ep/otx_ep_ethdev.c
diff --git a/drivers/net/octeontx_ep/otx_ep_rxtx.c b/drivers/net/octeon_ep/otx_ep_rxtx.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_rxtx.c
rename to drivers/net/octeon_ep/otx_ep_rxtx.c
diff --git a/drivers/net/octeontx_ep/otx_ep_rxtx.h b/drivers/net/octeon_ep/otx_ep_rxtx.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_rxtx.h
rename to drivers/net/octeon_ep/otx_ep_rxtx.h
diff --git a/drivers/net/octeontx_ep/otx_ep_vf.c b/drivers/net/octeon_ep/otx_ep_vf.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_vf.c
rename to drivers/net/octeon_ep/otx_ep_vf.c
diff --git a/drivers/net/octeontx_ep/otx_ep_vf.h b/drivers/net/octeon_ep/otx_ep_vf.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_vf.h
rename to drivers/net/octeon_ep/otx_ep_vf.h
diff --git a/drivers/net/octeontx_ep/version.map b/drivers/net/octeon_ep/version.map
similarity index 100%
rename from drivers/net/octeontx_ep/version.map
rename to drivers/net/octeon_ep/version.map