diff --git a/tmk_core/common/actionmap.h b/tmk_core/common/actionmap.h
index 0b57ee74..0e68af98 100644
--- a/tmk_core/common/actionmap.h
+++ b/tmk_core/common/actionmap.h
@@ -271,7 +271,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AC_MEDIA_REWIND		ACTION_USAGE_CONSUMER(TRANSPORT_REWIND)
 #define AC_MEDIA_STOP		ACTION_USAGE_CONSUMER(TRANSPORT_STOP)
 #define AC_MEDIA_PLAY_PAUSE	ACTION_USAGE_CONSUMER(TRANSPORT_PLAY_PAUSE)
-#define AC_MEDIA_EJECT		ACTION_USAGE_CONSUMER(TRANSPORT_STOP_EJECT)
+#define AC_MEDIA_EJECT		ACTION_USAGE_CONSUMER(TRANSPORT_EJECT)
 #define AC_MEDIA_SELECT		ACTION_USAGE_CONSUMER(APPLAUNCH_CC_CONFIG)
 #define AC_MAIL			ACTION_USAGE_CONSUMER(APPLAUNCH_EMAIL)
 #define AC_CALCULATOR		ACTION_USAGE_CONSUMER(APPLAUNCH_CALCULATOR)
@@ -418,7 +418,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define AC_MRWD			ACTION_USAGE_CONSUMER(TRANSPORT_REWIND)
 #define AC_MSTP			ACTION_USAGE_CONSUMER(TRANSPORT_STOP)
 #define AC_MPLY			ACTION_USAGE_CONSUMER(TRANSPORT_PLAY_PAUSE)
-#define AC_EJCT			ACTION_USAGE_CONSUMER(TRANSPORT_STOP_EJECT)
+#define AC_EJCT			ACTION_USAGE_CONSUMER(TRANSPORT_EJECT)
 #define AC_MSEL			ACTION_USAGE_CONSUMER(APPLAUNCH_CC_CONFIG)
 #define AC_MAIL			ACTION_USAGE_CONSUMER(APPLAUNCH_EMAIL)
 #define AC_CALC			ACTION_USAGE_CONSUMER(APPLAUNCH_CALCULATOR)
diff --git a/tmk_core/common/report.h b/tmk_core/common/report.h
index fcafbd5f..3896dbe9 100644
--- a/tmk_core/common/report.h
+++ b/tmk_core/common/report.h
@@ -189,7 +189,7 @@ typedef struct {
     (key == KC_MEDIA_FAST_FORWARD   ?  TRANSPORT_FAST_FORWARD : \
     (key == KC_MEDIA_REWIND         ?  TRANSPORT_REWIND : \
     (key == KC_MEDIA_STOP           ?  TRANSPORT_STOP : \
-    (key == KC_MEDIA_EJECT          ?  TRANSPORT_STOP_EJECT : \
+    (key == KC_MEDIA_EJECT          ?  TRANSPORT_EJECT : \
     (key == KC_MEDIA_PLAY_PAUSE     ?  TRANSPORT_PLAY_PAUSE : \
     (key == KC_MEDIA_SELECT         ?  APPLAUNCH_CC_CONFIG : \
     (key == KC_MAIL                 ?  APPLAUNCH_EMAIL : \