diff --git a/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.h b/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.h
index aad67353..b1ff9e03 100644
--- a/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.h
+++ b/plugins/Kaleidoscope-Leader/src/kaleidoscope/plugin/Leader.h
@@ -62,10 +62,10 @@ constexpr Key LeaderKey(uint8_t n) {
 class Leader : public kaleidoscope::Plugin {
  public:
   typedef void (*action_t)(uint8_t seq_index);
-  typedef struct {
+  struct dictionary_t {
     Key sequence[LEADER_MAX_SEQUENCE_LENGTH + 1];
     action_t action;
-  } dictionary_t;
+  };
 
   const dictionary_t *dictionary;
 
diff --git a/plugins/Kaleidoscope-MagicCombo/src/kaleidoscope/plugin/MagicCombo.h b/plugins/Kaleidoscope-MagicCombo/src/kaleidoscope/plugin/MagicCombo.h
index a498a922..696f0642 100644
--- a/plugins/Kaleidoscope-MagicCombo/src/kaleidoscope/plugin/MagicCombo.h
+++ b/plugins/Kaleidoscope-MagicCombo/src/kaleidoscope/plugin/MagicCombo.h
@@ -52,10 +52,10 @@ namespace plugin {
 class MagicCombo : public kaleidoscope::Plugin {
  public:
   typedef void (*ComboAction)(uint8_t combo_index);
-  typedef struct {
+  struct Combo {
     ComboAction action;
     int8_t keys[MAX_COMBO_LENGTH + 1];
-  } Combo;
+  };
 
 #ifndef NDEPRECATED
   DEPRECATED(MAGICCOMBO_MIN_INTERVAL)
diff --git a/plugins/Kaleidoscope-ShapeShifter/src/kaleidoscope/plugin/ShapeShifter.h b/plugins/Kaleidoscope-ShapeShifter/src/kaleidoscope/plugin/ShapeShifter.h
index 312f1b20..aa0a7988 100644
--- a/plugins/Kaleidoscope-ShapeShifter/src/kaleidoscope/plugin/ShapeShifter.h
+++ b/plugins/Kaleidoscope-ShapeShifter/src/kaleidoscope/plugin/ShapeShifter.h
@@ -27,9 +27,9 @@ namespace plugin {
 
 class ShapeShifter : public kaleidoscope::Plugin {
  public:
-  typedef struct {
+  struct dictionary_t {
     Key original, replacement;
-  } dictionary_t;
+  };
 
   const dictionary_t *dictionary = nullptr;
 
diff --git a/plugins/Kaleidoscope-Syster/src/kaleidoscope/plugin/Syster.h b/plugins/Kaleidoscope-Syster/src/kaleidoscope/plugin/Syster.h
index c3b6487b..39e1a79c 100644
--- a/plugins/Kaleidoscope-Syster/src/kaleidoscope/plugin/Syster.h
+++ b/plugins/Kaleidoscope-Syster/src/kaleidoscope/plugin/Syster.h
@@ -35,11 +35,11 @@ namespace plugin {
 
 class Syster : public kaleidoscope::Plugin {
  public:
-  typedef enum {
+  enum action_t : uint8_t {
     StartAction,
     EndAction,
     SymbolAction
-  } action_t;
+  };
 
   void reset();