diff --git a/Makefile b/Makefile
index 9ddfd03..f5b27c1 100644
--- a/Makefile
+++ b/Makefile
@@ -97,5 +97,5 @@ build_solutions:
     for lab in "Array_Types" "Record_Types" "Subprograms" "Packages" "Private_Types" "Access_Types" \
 	"Exceptions" "Interfacing_With_C" "Tasking_Protected_Objects" "Subprogram_Contracts"; do \
 		echo $$lab; \
-		Mode=Solution Lab="$$lab" alr build; \
+		Mode=Answer Lab="$$lab" alr build; \
 	done
diff --git a/README.md b/README.md
index 5b16ba9..ad2d96c 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ On order to work on the labs you must first start GNAT Studio.
 
 On the scenario tab on the left (if it's not there click the View menu > Scenario), chose
 the lab you want to work by setting the "Lab" scenario variable. Make sure that "Mode" is set
-to "Problem"
+to "Question"
 
 On the Project tab, you should then have access to the main file of the lab in question, which
 contains the questions.
@@ -45,7 +45,7 @@ You can compile and run using the dedicated GNAT Studio build / run menus and bu
 
 ## Run the solved exercises
 
-If you want to see or run the solutions, on the scenario tab select "Mode" = "Solution". This
+If you want to see or run the solutions, on the scenario tab select "Mode" = "Answer". This
 will select a new main file, which contains a solution for each lab.
 Warning: After having changed the "Mode" variable, you may need to recompile the project by force,
 by cleaning it.
diff --git a/doc/index.rst b/doc/index.rst
index ea56596..e61124f 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -28,7 +28,7 @@ In order to work on the labs you must first start gnat studio.
 
 On the scenario tab on the left (if it's not there click the View menu > Scenario), choose
 the lab you want to work by setting the "Lab" scenario variable. Make sure that "Mode" is set
-to "Problem".
+to "Question".
 
 On the Project tab, you should then have access to the main file of the lab in question, which
 contains the questions.
@@ -38,7 +38,7 @@ You can compile and run using the dedicated GNAT Studio build / run menus and bu
 Run the solved exercises
 ------------------------
 
-If you want to see or run the solutions, on the scenario tab select "Mode" = "Solution". This
+If you want to see or run the solutions, on the scenario tab select "Mode" = "Answer". This
 will select a new main file, which contains a solution for each lab.
 Warning: After having changed the "Mode" variable, you may need to recompile the project by force,
 by cleaning it.
diff --git a/labs_solar_system.gpr b/labs_solar_system.gpr
index 70a6d38..36d5d0b 100644
--- a/labs_solar_system.gpr
+++ b/labs_solar_system.gpr
@@ -19,15 +19,15 @@ project Labs_Solar_System is
        "Subprogram_Contracts");
    Lab : Lab_T := external ("Lab", "Getting_Started");
 
-   type Mode_Type is ("Problem", "Solution");
-   Mode : Mode_Type := external ("Mode", "Problem");
+   type Mode_Type is ("Question", "Answer");
+   Mode : Mode_Type := external ("Mode", "Question");
 
    Answer_Mode_Dir := "";
    case Mode is
-      when "Problem" =>
+      when "Question" =>
          Answer_Mode_Dir := "src";
 
-      when "Solution" =>
+      when "Answer" =>
          Answer_Mode_Dir := "answers";
    end case;
 
diff --git a/src/060_record_types/solar_system.gpr b/src/060_record_types/solar_system.gpr
index 373215a..40f0e56 100644
--- a/src/060_record_types/solar_system.gpr
+++ b/src/060_record_types/solar_system.gpr
@@ -7,18 +7,18 @@ project Solar_System is
    LOADER : LOADER_Type := external ("LOADER", "ROM");
 
 
-   type Mode_Type is ("Problem", "Solution");
-   Mode : Mode_Type := external ("Mode", "Problem");
+   type Mode_Type is ("Question", "Answer");
+   Mode : Mode_Type := external ("Mode", "Question");
 
    for Main use ("main");
    for Object_Dir use "obj";
    for Languages use ("Ada");
 
    case Mode is
-      when "Problem" =>
+      when "Question" =>
          for Source_Dirs use ("src");
 
-      when "Solution" =>
+      when "Answer" =>
          for Source_Dirs use ("answers");
    end case;