diff --git a/GW/src/Operation_Layer/Operation_Mode.c b/GW/src/Operation_Layer/Drive_Mode.c
similarity index 100%
rename from GW/src/Operation_Layer/Operation_Mode.c
rename to GW/src/Operation_Layer/Drive_Mode.c
diff --git a/GW/src/Operation_Layer/Operation_Mode.h b/GW/src/Operation_Layer/Drive_Mode.h
similarity index 100%
rename from GW/src/Operation_Layer/Operation_Mode.h
rename to GW/src/Operation_Layer/Drive_Mode.h
diff --git a/GW/src/Safety_Layer/CRC/ALV.c b/GW/src/Safety_Layer/ARC/Arc.c
similarity index 100%
rename from GW/src/Safety_Layer/CRC/ALV.c
rename to GW/src/Safety_Layer/ARC/Arc.c
diff --git a/GW/src/Safety_Layer/CRC/ALV.h b/GW/src/Safety_Layer/ARC/Arc.h
similarity index 100%
rename from GW/src/Safety_Layer/CRC/ALV.h
rename to GW/src/Safety_Layer/ARC/Arc.h