diff --git a/keyboards/exclusive/e6v2/bmc/config.h b/keyboards/exclusive/e6v2/oe_bmc/config.h
similarity index 97%
rename from keyboards/exclusive/e6v2/bmc/config.h
rename to keyboards/exclusive/e6v2/oe_bmc/config.h
index 7c6fcccdb98..fc7c91ca665 100644
--- a/keyboards/exclusive/e6v2/bmc/config.h
+++ b/keyboards/exclusive/e6v2/oe_bmc/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0x0000
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    exclusive
-#define PRODUCT         e6v2 bmc
+#define PRODUCT         e6v2 oe bmc
 #define DESCRIPTION     A custom 60% keyboard
 
 /* key matrix size */
diff --git a/keyboards/exclusive/e6v2/bmc/info.json b/keyboards/exclusive/e6v2/oe_bmc/info.json
similarity index 100%
rename from keyboards/exclusive/e6v2/bmc/info.json
rename to keyboards/exclusive/e6v2/oe_bmc/info.json
diff --git a/keyboards/exclusive/e6v2/bmc/keymaps/default/config.h b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/config.h
similarity index 100%
rename from keyboards/exclusive/e6v2/bmc/keymaps/default/config.h
rename to keyboards/exclusive/e6v2/oe_bmc/keymaps/default/config.h
diff --git a/keyboards/exclusive/e6v2/bmc/keymaps/default/keymap.c b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/exclusive/e6v2/bmc/keymaps/default/keymap.c
rename to keyboards/exclusive/e6v2/oe_bmc/keymaps/default/keymap.c
diff --git a/keyboards/exclusive/e6v2/bmc/keymaps/default/readme.md b/keyboards/exclusive/e6v2/oe_bmc/keymaps/default/readme.md
similarity index 100%
rename from keyboards/exclusive/e6v2/bmc/keymaps/default/readme.md
rename to keyboards/exclusive/e6v2/oe_bmc/keymaps/default/readme.md
diff --git a/keyboards/exclusive/e6v2/bmc/bmc.c b/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
similarity index 99%
rename from keyboards/exclusive/e6v2/bmc/bmc.c
rename to keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
index 257b68b8b4e..5357550ae12 100644
--- a/keyboards/exclusive/e6v2/bmc/bmc.c
+++ b/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "bmc.h"
+#include "oe_bmc.h"
 #include "rgblight.h"
 #include "i2c_master.h"
 
diff --git a/keyboards/exclusive/e6v2/bmc/bmc.h b/keyboards/exclusive/e6v2/oe_bmc/oe_bmc.h
similarity index 100%
rename from keyboards/exclusive/e6v2/bmc/bmc.h
rename to keyboards/exclusive/e6v2/oe_bmc/oe_bmc.h
diff --git a/keyboards/exclusive/e6v2/bmc/readme.md b/keyboards/exclusive/e6v2/oe_bmc/readme.md
similarity index 85%
rename from keyboards/exclusive/e6v2/bmc/readme.md
rename to keyboards/exclusive/e6v2/oe_bmc/readme.md
index b69ac792cf8..a386abf6c0a 100644
--- a/keyboards/exclusive/e6v2/bmc/readme.md
+++ b/keyboards/exclusive/e6v2/oe_bmc/readme.md
@@ -1,6 +1,6 @@
-# E6-V2 Bootmapper Client (ps2avrgb)
+# E6-V2 Bootmapper Client (ps2avrgb) OE
 
-These docs are for the BMC version of the E6-V2 PCB which has an atmega32a microcontroller. Please do not flash this `.hex` file on your atmega32u4 equipped E6-V2. 
+These docs are for the BMC version of the E6-V2 PCB sold during Round 1 which has an atmega32a microcontroller. Please do not flash this `.hex` file on your atmega32u4 equipped E6-V2 or your E6V2 BMC from Round 2. 
 
 Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)  
 Hardware Supported: ps2avrgb E6-V2 with atmega32a microcontroller  
@@ -8,7 +8,7 @@ Hardware Availability: [geekhack.org/index.php?topic=90787.0](https://geekhack.o
 
 Make example for this keyboard (after setting up your build environment):
 
-    make exclusive/e6v2/bmc:default
+    make exclusive/e6v2/oe_bmc:default
 
 Flashing
 
diff --git a/keyboards/exclusive/e6v2/bmc/rules.mk b/keyboards/exclusive/e6v2/oe_bmc/rules.mk
similarity index 100%
rename from keyboards/exclusive/e6v2/bmc/rules.mk
rename to keyboards/exclusive/e6v2/oe_bmc/rules.mk
diff --git a/keyboards/exclusive/e6v2/bmc/usbconfig.h b/keyboards/exclusive/e6v2/oe_bmc/usbconfig.h
similarity index 100%
rename from keyboards/exclusive/e6v2/bmc/usbconfig.h
rename to keyboards/exclusive/e6v2/oe_bmc/usbconfig.h
diff --git a/keyboards/exclusive/e6v2/readme.md b/keyboards/exclusive/e6v2/readme.md
index c09d1ccf1b5..515db082e0e 100644
--- a/keyboards/exclusive/e6v2/readme.md
+++ b/keyboards/exclusive/e6v2/readme.md
@@ -13,7 +13,7 @@ The E6-V2 is a 60% keyboard manufactured by Exclusive.
 
 These docs are for the QMK version of the E6-V2 PCB. [More info on qmk.fm](http://qmk.fm/)
 
-The E6V2 has been available with either a bootmapper client or QMK powered PCB. During the second round, the QMK powered PCB was redesigned and used different ports and a different switch matrix. 
+The E6V2 has been available with either a Bootmapper Client or QMK-powered PCB. During the second round, the QMK-powered and BMC PCBs were redesigned, and used different ports and a different switch matrix. 
 
 Please use the appropriate version when making your firmware. Flashing one in place of the other, can brick your PCB. Please be certain whether you have a OE or LE  PCB.