diff --git a/mario/blocks/mushroomblock.cpp b/mario/blocks/mushroomblock.cpp
index 2b30ac5..bf1a33d 100644
--- a/mario/blocks/mushroomblock.cpp
+++ b/mario/blocks/mushroomblock.cpp
@@ -8,15 +8,15 @@ MushroomBlock::MushroomBlock( int x, int y, std::shared_ptr< SDLPP::Renderer > &
     setHidden(true);
     ensureCollision();
     setId(MUSHROOM_ID);
-    auto bottom_detect = SDLPP::RectColider( 0.2, 1, 0.6, 0, MARIO_FLOOR_DETECT );
+    auto bottom_detect = SDLPP::RectColider( 0.2, 1, 0.6, 0, NPC_FLOOR_DETECT );
     bottom_detect.setColor("#FF0000");
     bottom_detect.setOutlineColor("#FF0000");
     bottom_detect.setMinHeight(1);
     addCollision(bottom_detect);
     addCollision(
-        SDLPP::RectColider( 0, 0.25, 0.1, 0.6, MARIO_LEFT_SIDE_DETECT ) );
+        SDLPP::RectColider( 0, 0.25, 0.1, 0.6, NPC_LEFT_SIDE_DETECT ) );
     addCollision(
-        SDLPP::RectColider( 0.9, 0.25, 0.1, 0.6, MARIO_RIGHT_SIDE_DETECT ) );
+        SDLPP::RectColider( 0.9, 0.25, 0.1, 0.6, NPC_RIGHT_SIDE_DETECT ) );
 }
 
 void MushroomBlock::custom_move(int ticks) {
diff --git a/mario/visitors/mushroom_visitor.cpp b/mario/visitors/mushroom_visitor.cpp
index 858a262..93282a4 100644
--- a/mario/visitors/mushroom_visitor.cpp
+++ b/mario/visitors/mushroom_visitor.cpp
@@ -28,16 +28,16 @@ void MushroomVisitor::visit( const SDLPP::RenderObject &obj ) {
     case CANNON_TOWER_ID:
     case CANNON_PEDESTAL_ID:
     case CANNON_ID:
-        if ( from == MARIO_FLOOR_DETECT ) {
+        if ( from == NPC_FLOOR_DETECT ) {
             onGround = true;
             groundY = obj.getPos().getY();
-        } else if ( from == MARIO_LEFT_SIDE_DETECT ) {
+        } else if ( from == NPC_LEFT_SIDE_DETECT ) {
             if(!left && !right) {
                 movement_blockage = obj.getPos();
                 validXPos = movement_blockage.getX() + BLOCK_SIZE;
             }
             left = true;
-        } else if (from == MARIO_RIGHT_SIDE_DETECT ) {
+        } else if (from == NPC_RIGHT_SIDE_DETECT ) {
             if(!left && !right) {
                 movement_blockage = obj.getPos();
                 validXPos = movement_blockage.getX() - BLOCK_SIZE;