diff --git a/feeds/express-wifi/openvswitch/Makefile b/feeds/openflow/openvswitch/Makefile
similarity index 100%
rename from feeds/express-wifi/openvswitch/Makefile
rename to feeds/openflow/openvswitch/Makefile
diff --git a/feeds/express-wifi/openvswitch/README.md b/feeds/openflow/openvswitch/README.md
similarity index 100%
rename from feeds/express-wifi/openvswitch/README.md
rename to feeds/openflow/openvswitch/README.md
diff --git a/feeds/express-wifi/openvswitch/files/openvswitch.config b/feeds/openflow/openvswitch/files/openvswitch.config
similarity index 100%
rename from feeds/express-wifi/openvswitch/files/openvswitch.config
rename to feeds/openflow/openvswitch/files/openvswitch.config
diff --git a/feeds/express-wifi/openvswitch/files/openvswitch.init b/feeds/openflow/openvswitch/files/openvswitch.init
similarity index 100%
rename from feeds/express-wifi/openvswitch/files/openvswitch.init
rename to feeds/openflow/openvswitch/files/openvswitch.init
diff --git a/feeds/express-wifi/openvswitch/files/ovs-ctl-wrapper b/feeds/openflow/openvswitch/files/ovs-ctl-wrapper
similarity index 100%
rename from feeds/express-wifi/openvswitch/files/ovs-ctl-wrapper
rename to feeds/openflow/openvswitch/files/ovs-ctl-wrapper
diff --git a/feeds/express-wifi/openvswitch/openvswitch.mk b/feeds/openflow/openvswitch/openvswitch.mk
similarity index 100%
rename from feeds/express-wifi/openvswitch/openvswitch.mk
rename to feeds/openflow/openvswitch/openvswitch.mk
diff --git a/feeds/express-wifi/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch b/feeds/openflow/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
similarity index 100%
rename from feeds/express-wifi/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
rename to feeds/openflow/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch
diff --git a/feeds/express-wifi/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch b/feeds/openflow/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch
similarity index 100%
rename from feeds/express-wifi/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch
rename to feeds/openflow/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch
diff --git a/feeds/express-wifi/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch b/feeds/openflow/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch
similarity index 100%
rename from feeds/express-wifi/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch
rename to feeds/openflow/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch
diff --git a/feeds/express-wifi/openvswitch/patches/0004-build-trim-build.patch b/feeds/openflow/openvswitch/patches/0004-build-trim-build.patch
similarity index 100%
rename from feeds/express-wifi/openvswitch/patches/0004-build-trim-build.patch
rename to feeds/openflow/openvswitch/patches/0004-build-trim-build.patch
diff --git a/feeds/express-wifi/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch b/feeds/openflow/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch
similarity index 100%
rename from feeds/express-wifi/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch
rename to feeds/openflow/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch
diff --git a/feeds/express-wifi/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch b/feeds/openflow/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch
similarity index 100%
rename from feeds/express-wifi/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch
rename to feeds/openflow/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch
diff --git a/profiles/express-wifi.yml b/profiles/express-wifi.yml
deleted file mode 100644
index a861a24ea..000000000
--- a/profiles/express-wifi.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-description: Add the Express Wifi dependencies
-feeds:
-  - name: expresss_wifi
-    path: ../../feeds/express-wifi
-
-packages:
-  - openvswitch
-  - xl2tpd
diff --git a/profiles/openflow.yml b/profiles/openflow.yml
new file mode 100644
index 000000000..08e9c62a4
--- /dev/null
+++ b/profiles/openflow.yml
@@ -0,0 +1,8 @@
+---
+description: Add the OpenFlow dependencies
+feeds:
+  - name: openflow
+    path: ../../feeds/openflow
+
+packages:
+  - openvswitch
diff --git a/profiles/ucentral-ap.yml b/profiles/ucentral-ap.yml
index 5cd8a5269..2bb402205 100644
--- a/profiles/ucentral-ap.yml
+++ b/profiles/ucentral-ap.yml
@@ -8,7 +8,7 @@ feeds:
 
 include:
   - webui
-  - express-wifi
+  - openflow
 
 packages:
   - kmod-batman-adv