diff --git a/MOVED b/MOVED
index fa8693e1eb85..a15455d45cee 100644
--- a/MOVED
+++ b/MOVED
@@ -17200,3 +17200,4 @@ devel/android-tools-adb|devel/android-tools|2022-06-09|Port has been updated, un
 devel/android-tools-fastboot|devel/android-tools|2022-06-09|Port has been updated and consolidated into devel/android-tools
 devel/py-lark-parser|devel/py-lark|2022-06-09|Remove obsoleted port. Use devel/py-lark instead
 deskutils/egroupware|deskutils/egroupware@php74|2022-06-12|Merge into flavorized version
+databases/py-apache-arrow|databases/py-apache-arrow|2022-06-12|Rename to avoid conflict with devel/py-arrow and to match the project name
diff --git a/databases/Makefile b/databases/Makefile
index 40fabac07a48..a9c24726eb17 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -760,8 +760,8 @@
     SUBDIR += py-alembic
     SUBDIR += py-alembic14
     SUBDIR += py-alembic16
+    SUBDIR += py-apache-arrow
     SUBDIR += py-apsw
-    SUBDIR += py-arrow
     SUBDIR += py-asyncmy
     SUBDIR += py-asyncpg
     SUBDIR += py-berkeleydb
diff --git a/databases/py-arrow/Makefile b/databases/py-apache-arrow/Makefile
similarity index 89%
rename from databases/py-arrow/Makefile
rename to databases/py-apache-arrow/Makefile
index 85330dd780d4..762933cc8d00 100644
--- a/databases/py-arrow/Makefile
+++ b/databases/py-apache-arrow/Makefile
@@ -1,9 +1,9 @@
-PORTNAME=	arrow
+PORTNAME=	apache-arrow
 DISTVERSION=	8.0.0
 CATEGORIES=	databases python
-MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION}
+MASTER_SITES=	APACHE/arrow/arrow-${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
+DISTNAME=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Columnar in-memory analytics layer for big data
diff --git a/databases/py-arrow/distinfo b/databases/py-apache-arrow/distinfo
similarity index 100%
rename from databases/py-arrow/distinfo
rename to databases/py-apache-arrow/distinfo
diff --git a/databases/py-arrow/files/patch-cmake__modules_FindArrowPython.cmake b/databases/py-apache-arrow/files/patch-cmake__modules_FindArrowPython.cmake
similarity index 100%
rename from databases/py-arrow/files/patch-cmake__modules_FindArrowPython.cmake
rename to databases/py-apache-arrow/files/patch-cmake__modules_FindArrowPython.cmake
diff --git a/databases/py-arrow/pkg-descr b/databases/py-apache-arrow/pkg-descr
similarity index 100%
rename from databases/py-arrow/pkg-descr
rename to databases/py-apache-arrow/pkg-descr
diff --git a/databases/py-arrow/pkg-plist b/databases/py-apache-arrow/pkg-plist
similarity index 100%
rename from databases/py-arrow/pkg-plist
rename to databases/py-apache-arrow/pkg-plist