Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -10323,8 +10323,6 @@
 graphics/projectm-libvisual|graphics/libprojectm|2018-07-17|Code of projectm-libvisual was merged into graphics/libprojectm
 graphics/yafray|graphics/yafaray|2018-07-20|Project renamed
 lang/spec.alpha||2018-07-21|Unused in the ports tree
-sysutils/xen-tools|sysutils/xen-tools47|2018-07-23|Renamed to support multiple versions
-emulators/xen-kernel|emulators/xen-kernel47|2018-07-23|Renamed to support multiple versions
 emulators/xen||2018-07-23|Removed to support multiple versions
 devel/py-levenshtein|devel/py-python-Levenshtein|2018-07-28|Remove the duplicate
 comms/xwota||2018-07-28|Has expired: No server message and no upstream releases
@@ -11640,3 +11638,5 @@
 graphics/glitz||2019-02-23|Development stopped in 2008, not depended on
 x11/xfree86_xkb_xml||2019-02-24|The project is discontinued
 devel/rtichoke|devel/radian|2019-02-26|Project is renamed
+sysutils/xen-tools411|sysutils/xen-tools|2019-02-27|Rename in preparation for having a single Xen port
+emulators/xen-kernel411|emulators/xen-kernel|2019-02-27|Rename in preparation for having a single Xen port
Index: head/emulators/Makefile
===================================================================
--- head/emulators/Makefile
+++ head/emulators/Makefile
@@ -174,7 +174,7 @@
     SUBDIR += x49gp
     SUBDIR += xbraitenberg
     SUBDIR += xcpc
-    SUBDIR += xen-kernel411
+    SUBDIR += xen-kernel
     SUBDIR += xen-kernel47
     SUBDIR += xhomer
     SUBDIR += xsystem35
Index: head/emulators/xen-kernel411/Makefile
===================================================================
--- head/emulators/xen-kernel411/Makefile
+++ head/emulators/xen-kernel411/Makefile
@@ -5,7 +5,7 @@
 PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://downloads.xenproject.org/release/xen/${PORTVERSION}/
-PKGNAMESUFFIX=	-kernel411
+PKGNAMESUFFIX=	-kernel
 
 MAINTAINER=	royger@FreeBSD.org
 COMMENT=	Hypervisor using a microkernel design
Index: head/sysutils/Makefile
===================================================================
--- head/sysutils/Makefile
+++ head/sysutils/Makefile
@@ -1502,7 +1502,7 @@
     SUBDIR += xe
     SUBDIR += xe-guest-utilities
     SUBDIR += xen-guest-tools
-    SUBDIR += xen-tools411
+    SUBDIR += xen-tools
     SUBDIR += xen-tools47
     SUBDIR += xfburn
     SUBDIR += xfce4-battery-plugin
Index: head/sysutils/xen-tools411/Makefile
===================================================================
--- head/sysutils/xen-tools411/Makefile
+++ head/sysutils/xen-tools411/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xen
-PKGNAMESUFFIX=	-tools411
+PKGNAMESUFFIX=	-tools
 PORTVERSION=	4.11.0
 PORTREVISION=	7
 CATEGORIES=	sysutils emulators