diff --git a/cpp/src/castle_side.hpp b/cpp/src/castle_side.hpp
index 5a51b80..d9b0657 100644
--- a/cpp/src/castle_side.hpp
+++ b/cpp/src/castle_side.hpp
@@ -1,7 +1,7 @@
 #include <cstdint>
 
-enum class CastleSide : int8_t {
-    Neither = 0,
-    King = 1,
-    Queen = 2,
+enum CastleSide : int8_t {
+    NeitherSide = 0,
+    KingSide = 1,
+    QueenSide = 2,
 };
diff --git a/cpp/src/move.hpp b/cpp/src/move.hpp
index 2f95ef6..25dda12 100644
--- a/cpp/src/move.hpp
+++ b/cpp/src/move.hpp
@@ -9,7 +9,7 @@ struct Move {
     int8_t target_square;
 
     bool is_capturing = false;
-    CastleSide castle_side = CastleSide::Neither;
+    CastleSide castle_side = CastleSide::NeitherSide;
     bool en_passant = false;
     int8_t promoting_to = 0;
 };
diff --git a/cpp/src/pieces/king.cpp b/cpp/src/pieces/king.cpp
index 47735c2..08cd88d 100644
--- a/cpp/src/pieces/king.cpp
+++ b/cpp/src/pieces/king.cpp
@@ -53,22 +53,22 @@ std::vector<Move> king_moves(const Board& b, const Coords xy) {
                                    ? b.w_castle_rights
                                    : b.b_castle_rights;
 
-    if (castling_rights == CastleSide::Neither)
+    if (castling_rights == CastleSide::NeitherSide)
         return ret;
 
-    if (castling_rights == CastleSide::King && is_clear_king_side(b, xy)) {
+    if (castling_rights & CastleSide::KingSide && is_clear_king_side(b, xy)) {
         ret.push_back(Move{
             xy.to_index(),
             Coords{6, xy.y}.to_index(),
-            .castle_side = CastleSide::King
+            .castle_side = CastleSide::KingSide
         });
     }
 
-    if (castling_rights == CastleSide::Queen && is_clear_queen_side(b, xy)) {
+    if (castling_rights & CastleSide::QueenSide && is_clear_queen_side(b, xy)) {
         ret.push_back(Move{
             xy.to_index(),
             Coords{2, xy.y}.to_index(),
-            .castle_side = CastleSide::Queen
+            .castle_side = CastleSide::QueenSide
         });
     }