diff --git a/swad_account.c b/swad_account.c
index fb061880..7697e8b2 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -1019,8 +1019,8 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat,
       Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
      }
 
-   /***** Remove exams made by user in all courses *****/
-   Tst_RemoveExamsMadeByUsrInAllCrss (UsrDat->UsrCod);
+   /***** Remove test results made by user in all courses *****/
+   Tst_RemoveTestResultsMadeByUsrInAllCrss (UsrDat->UsrCod);
 
    /***** Remove user's notifications *****/
    Ntf_RemoveUsrNtfs (UsrDat->UsrCod);
diff --git a/swad_action.c b/swad_action.c
index 528fc066..d5b6d744 100644
--- a/swad_action.c
+++ b/swad_action.c
@@ -821,12 +821,12 @@ Assessment:
 	673. ActDisableTag		Disable a tag
 	674. ActRenTag			Rename a tag
 	675. ActRcvCfgTst		Receive configuration of test
-	676. ActReqSeeMyTstExa		Select range of dates to see my results of test exams
-	677. ActSeeMyTstExa		Show my test results
-	678. ActReqSeeUsrTstExa		Select users and range of dates to see results of test exams
-	679. ActSeeUsrTstExa		Show test results of several users
-	680. ActSeeOneTstExaMe		Show one test exam of me as student
-	681. ActSeeOneTstExaOth		Show one test exam of other user
+	676. ActReqSeeMyTstRes		Select range of dates to see my test results
+	677. ActSeeMyTstRes		Show my test results
+	678. ActReqSeeUsrTstRes		Select users and range of dates to see test results
+	679. ActSeeUsrTstRes		Show test results of several users
+	680. ActSeeOneTstResMe		Show one test result of me as student
+	681. ActSeeOneTstResOth		Show one test result of other user
 
 	682. ActPrnCal			Show print view of the academic calendar of the course
 	683. ActChgCal1stDay		Change first day of week and show academic calendar of the course
@@ -2191,8 +2191,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
    /* ActChgDatWrkCrs	*/{1046,-1,TabUnk,ActReqAsgWrkCrs	,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Brw_ChgFileMetadata		,NULL},
    /* ActDowWrkCrs      */{1120,-1,TabUnk,ActReqAsgWrkCrs	,0x1FF,0x1FF,0x000,Act_CONT_NORM,Act_DOWNLD_FILE,Brw_DownloadFile		,NULL				,NULL},
 
-   /* ActSeeTst		*/{  29,-1,TabUnk,ActReqTst		,0x118,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowNewTestExam		,NULL},
-   /* ActAssTst		*/{  98,-1,TabUnk,ActReqTst		,0x118,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_AssessTestExam		,NULL},
+   /* ActSeeTst		*/{  29,-1,TabUnk,ActReqTst		,0x118,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowNewTest		,NULL},
+   /* ActAssTst		*/{  98,-1,TabUnk,ActReqTst		,0x118,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_AssessTest			,NULL},
 
    /* ActEdiTstQst	*/{ 104,-1,TabUnk,ActReqTst		,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,Tst_SetIniEndDates		,Tst_ShowFormAskEditTsts	,NULL},
    /* ActEdiOneTstQst	*/{ 105,-1,TabUnk,ActReqTst		,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowFormEditOneQst		,NULL},
@@ -2210,12 +2210,12 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
    /* ActRenTag		*/{ 143,-1,TabUnk,ActReqTst		,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_RenameTag			,NULL},
    /* ActRcvCfgTst	*/{ 454,-1,TabUnk,ActReqTst		,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ReceiveConfigTst		,NULL},
 
-   /* ActReqSeeMyTstExa	*/{1083,-1,TabUnk,ActReqTst		,0x108,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,Tst_SetIniEndDates		,Tst_SelDatesToSeeMyExams	,NULL},
-   /* ActSeeMyTstExa	*/{1084,-1,TabUnk,ActReqTst		,0x108,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowMyExams		,NULL},
-   /* ActSeeOneTstExaMe	*/{1085,-1,TabUnk,ActReqTst		,0x108,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowOneExam		,NULL},
-   /* ActReqSeeUsrTstExa*/{1080,-1,TabUnk,ActReqTst		,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,Tst_SetIniEndDates		,Tst_SelUsrsToSeeUsrsExams	,NULL},
-   /* ActSeeUsrTstExa	*/{1081,-1,TabUnk,ActReqTst		,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowUsrsExams		,NULL},
-   /* ActSeeOneTstExaOth*/{1082,-1,TabUnk,ActReqTst		,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowOneExam		,NULL},
+   /* ActReqSeeMyTstRes	*/{1083,-1,TabUnk,ActReqTst		,0x108,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,Tst_SetIniEndDates		,Tst_SelDatesToSeeMyTestResults	,NULL},
+   /* ActSeeMyTstRes	*/{1084,-1,TabUnk,ActReqTst		,0x108,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowMyTestResults		,NULL},
+   /* ActSeeOneTstResMe	*/{1085,-1,TabUnk,ActReqTst		,0x108,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowOneTestResult		,NULL},
+   /* ActReqSeeUsrTstRes*/{1080,-1,TabUnk,ActReqTst		,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,Tst_SetIniEndDates		,Tst_SelUsrsToSeeUsrsTestResults,NULL},
+   /* ActSeeUsrTstRes	*/{1081,-1,TabUnk,ActReqTst		,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowUsrsTestResults	,NULL},
+   /* ActSeeOneTstResOth*/{1082,-1,TabUnk,ActReqTst		,0x110,0x100,0x000,Act_CONT_NORM,Act_THIS_WINDOW,NULL				,Tst_ShowOneTestResult		,NULL},
 
    /* ActPrnCal		*/{  71,-1,TabUnk,ActSeeCal		,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_BLNK_WINDOW,NULL				,Cal_DrawCalendar		,NULL},
    /* ActChgCal1stDay	*/{1485,-1,TabUnk,ActSeeCal		,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,Cal_ChangeFirstDayOfWeek	,Cal_DrawCalendar		,NULL},
@@ -3948,12 +3948,12 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] =	// Do not reuse uniq
 	ActAutUsrChgLan,	// #1077
 	ActSeeDocCrs,		// #1078
 	ActSeeMrkCrs,		// #1079
-	ActReqSeeUsrTstExa,	// #1080
-	ActSeeUsrTstExa,	// #1081
-	ActSeeOneTstExaOth,	// #1082
-	ActReqSeeMyTstExa,	// #1083
-	ActSeeMyTstExa,		// #1084
-	ActSeeOneTstExaMe,	// #1085
+	ActReqSeeUsrTstRes,	// #1080
+	ActSeeUsrTstRes,	// #1081
+	ActSeeOneTstResOth,	// #1082
+	ActReqSeeMyTstRes,	// #1083
+	ActSeeMyTstRes,		// #1084
+	ActSeeOneTstResMe,	// #1085
 	ActReqDatSeeMrkCrs,	// #1086
 	ActReqDatSeeMrkGrp,	// #1087
 	ActNewMaiMe,		// #1088
diff --git a/swad_action.h b/swad_action.h
index 6031cc08..df0b11b0 100644
--- a/swad_action.h
+++ b/swad_action.h
@@ -832,12 +832,12 @@ typedef int Act_Action_t;	// Must be a signed type, because -1 is used to indica
 #define ActRenTag		(ActRcvRchTxtCrsLnk+115)
 #define ActRcvCfgTst		(ActRcvRchTxtCrsLnk+116)
 
-#define ActReqSeeMyTstExa	(ActRcvRchTxtCrsLnk+117)
-#define ActSeeMyTstExa		(ActRcvRchTxtCrsLnk+118)
-#define ActSeeOneTstExaMe	(ActRcvRchTxtCrsLnk+119)
-#define ActReqSeeUsrTstExa	(ActRcvRchTxtCrsLnk+120)
-#define ActSeeUsrTstExa		(ActRcvRchTxtCrsLnk+121)
-#define ActSeeOneTstExaOth	(ActRcvRchTxtCrsLnk+122)
+#define ActReqSeeMyTstRes	(ActRcvRchTxtCrsLnk+117)
+#define ActSeeMyTstRes		(ActRcvRchTxtCrsLnk+118)
+#define ActSeeOneTstResMe	(ActRcvRchTxtCrsLnk+119)
+#define ActReqSeeUsrTstRes	(ActRcvRchTxtCrsLnk+120)
+#define ActSeeUsrTstRes		(ActRcvRchTxtCrsLnk+121)
+#define ActSeeOneTstResOth	(ActRcvRchTxtCrsLnk+122)
 
 #define ActPrnCal		(ActRcvRchTxtCrsLnk+123)
 #define ActChgCal1stDay		(ActRcvRchTxtCrsLnk+124)
diff --git a/swad_changelog.h b/swad_changelog.h
index 522c8741..d93c4de6 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -168,21 +168,19 @@
 
 // TODO: Change forms to change my webs / social networks to one unique form with a "Save changes" button
 
-// TODO: Change "Results tests" to "View exams" ?
-// TODO: Change "See exam" to "View exam" ?
-// TODO: Change "Test result" to "Exam" ?
-
 /*****************************************************************************/
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 16.66 (2016-11-21)"
+#define Log_PLATFORM_VERSION	"SWAD 16.67 (2016-11-21)"
 #define CSS_FILE		"swad16.60.1.css"
 #define JS_FILE			"swad16.46.1.js"
 
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
 /*
+        Version 16.67:    Nov 21, 2016	Refactoring in tests.
+					"Test exam" is now called "Test result". (207336 lines)
         Version 16.66:    Nov 21, 2016	Change icons for attendance.
 					Change icons for announcements.
 					Change icons for notices.
diff --git a/swad_course.c b/swad_course.c
index 89ca7ccd..6d86792e 100644
--- a/swad_course.c
+++ b/swad_course.c
@@ -2275,7 +2275,7 @@ static void Crs_EmptyCourseCompletely (long CrsCod)
    Svy_RemoveSurveys (Sco_SCOPE_CRS,CrsCod);
 
    /***** Remove all test exams made in the course *****/
-   Tst_RemoveCrsExams (CrsCod);
+   Tst_RemoveCrsTestResults (CrsCod);
 
    /***** Remove all tests questions in the course *****/
    Tst_RemoveCrsTests (CrsCod);
diff --git a/swad_enrollment.c b/swad_enrollment.c
index 485ced37..6190c382 100644
--- a/swad_enrollment.c
+++ b/swad_enrollment.c
@@ -3751,8 +3751,8 @@ static void Enr_EffectivelyRemUsrFromCrs (struct UsrData *UsrDat,struct Course *
       /***** Remove some information about files in course and groups *****/
       Brw_RemoveSomeInfoAboutCrsUsrFilesFromDB (UsrDat->UsrCod,Crs->CrsCod);
 
-      /***** Remove exams made by user in course *****/
-      Tst_RemoveExamsMadeByUsrInCrs (UsrDat->UsrCod,Crs->CrsCod);
+      /***** Remove test results made by user in course *****/
+      Tst_RemoveTestResultsMadeByUsrInCrs (UsrDat->UsrCod,Crs->CrsCod);
 
       /***** Set all the notifications for this user in this course as removed,
              except notifications about new messages *****/
diff --git a/swad_global.c b/swad_global.c
index a3b3390f..667791af 100644
--- a/swad_global.c
+++ b/swad_global.c
@@ -395,7 +395,7 @@ void Gbl_InitializeGlobals (void)
    /* Tests */
    Gbl.Test.Config.Pluggable = Tst_PLUGGABLE_UNKNOWN;
    Gbl.Test.NumQsts = Tst_CONFIG_DEFAULT_DEF_QUESTIONS;
-   Gbl.Test.AllowTeachers = false;	// Must the exam be saved?
+   Gbl.Test.AllowTeachers = false;	// Must the test result be saved?
    Gbl.Test.AllAnsTypes = false;
    Gbl.Test.ListAnsTypes[0] = '\0';
 
diff --git a/swad_global.h b/swad_global.h
index 8937218b..613e38c6 100644
--- a/swad_global.h
+++ b/swad_global.h
@@ -646,10 +646,10 @@ struct Globals
         } Tags;
       Tst_AnswerType_t AnswerType;
       unsigned NumQsts;
-      long QstCodes[Tst_MAX_QUESTIONS_PER_EXAM];	// Codes of the sent/received questions in a test
-      char StrIndexesOneQst[Tst_MAX_QUESTIONS_PER_EXAM][Tst_MAX_SIZE_INDEXES_ONE_QST+1];	// 0 1 2 3, 3 0 2 1, etc.
-      char StrAnswersOneQst[Tst_MAX_QUESTIONS_PER_EXAM][Tst_MAX_SIZE_ANSWERS_ONE_QST+1];	// Answers selected by user
-      bool AllowTeachers;	// Can teachers of this course see the exam?
+      long QstCodes[Tst_MAX_QUESTIONS_PER_TEST];	// Codes of the sent/received questions in a test
+      char StrIndexesOneQst[Tst_MAX_QUESTIONS_PER_TEST][Tst_MAX_SIZE_INDEXES_ONE_QST+1];	// 0 1 2 3, 3 0 2 1, etc.
+      char StrAnswersOneQst[Tst_MAX_QUESTIONS_PER_TEST][Tst_MAX_SIZE_ANSWERS_ONE_QST+1];	// Answers selected by user
+      bool AllowTeachers;	// Can teachers of this course see the test result?
       bool AllAnsTypes;
       struct
         {
diff --git a/swad_record.c b/swad_record.c
index 01d8ac23..8b7600cc 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -2297,7 +2297,7 @@ static void Rec_PutIconsCommands (void)
    extern const char *Txt_Admin_user;
    extern const char *Txt_Write_a_message;
    extern const char *Txt_View_works;
-   extern const char *Txt_View_exams;
+   extern const char *Txt_View_test_results;
    extern const char *Txt_View_attendance;
    extern const char *Txt_Following_unfollow;
    extern const char *Txt_Follow;
@@ -2368,14 +2368,14 @@ static void Rec_PutIconsCommands (void)
 
 	 /***** Button to view user's test exams *****/
 	 if (ItsMe)
-	    Lay_PutContextualLink (ActSeeMyTstExa,NULL,
+	    Lay_PutContextualLink (ActSeeMyTstRes,NULL,
 			           "exam64x64.png",
-			           Txt_View_exams,NULL,
+			           Txt_View_test_results,NULL,
 		                   NULL);
 	 else
-	    Lay_PutContextualLink (ActSeeUsrTstExa,Rec_PutParamsStudent,
+	    Lay_PutContextualLink (ActSeeUsrTstRes,Rec_PutParamsStudent,
 			           "exam64x64.png",
-			           Txt_View_exams,NULL,
+			           Txt_View_test_results,NULL,
 		                   NULL);
 
 	 /***** Button to view user's attendance *****/
diff --git a/swad_test.c b/swad_test.c
index c7156249..a29406ee 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -85,7 +85,7 @@ const char *Tst_PluggableDB[Tst_NUM_OPTIONS_PLUGGABLE] =
    "Y",
   };
 
-// Feedback to students in exams
+// Feedback to students in tests
 const char *Tst_FeedbackDB[Tst_NUM_TYPES_FEEDBACK] =
   {
    "nothing",		// No feedback
@@ -139,7 +139,7 @@ extern struct Globals Gbl;
 /***************************** Internal prototypes ***************************/
 /*****************************************************************************/
 
-static void Tst_PutFormToSeeResultsOfUsersTests (Act_Action_t Action);
+static void Tst_PutFormToViewResultsOfUsersTests (Act_Action_t Action);
 
 static void Tst_GetQuestionsAndAnswersFromForm (void);
 static void Tst_ShowTstTotalMark (double TotalScore);
@@ -148,8 +148,8 @@ static void Tst_SetTstStatus (unsigned NumTst,Tst_Status_t TstStatus);
 static Tst_Status_t Tst_GetTstStatus (unsigned NumTst);
 static unsigned Tst_GetNumAccessesTst (void);
 static void Tst_ShowTestQuestionsWhenSeeing (MYSQL_RES *mysql_res);
-static void Tst_ShowTstResultAfterAssess (long TstCod,unsigned *NumQstsNotBlank,double *TotalScore);
-static void Tst_WriteQstAndAnsExam (unsigned NumQst,long QstCod,MYSQL_ROW row,
+static void Tst_ShowTestResultAfterAssess (long TstCod,unsigned *NumQstsNotBlank,double *TotalScore);
+static void Tst_WriteQstAndAnsTest (unsigned NumQst,long QstCod,MYSQL_ROW row,
                                     double *ScoreThisQst,bool *AnswerIsNotBlank);
 static void Tst_PutFormToEditQstImage (struct Image *Image,int NumImgInForm,
                                        const char *ClassContainer,
@@ -178,29 +178,29 @@ static Tst_Feedback_t Tst_GetFeedbackTypeFromForm (void);
 static void Tst_CheckAndCorrectNumbersQst (void);
 static void Tst_ShowFormAnswerTypes (unsigned NumCols);
 static unsigned long Tst_GetQuestionsForEdit (MYSQL_RES **mysql_res);
-static unsigned long Tst_GetQuestionsForExam (MYSQL_RES **mysql_res);
+static unsigned long Tst_GetQuestionsForTest (MYSQL_RES **mysql_res);
 static void Tst_ListOneQstToEdit (void);
 static bool Tst_GetOneQuestionByCod (long QstCod,MYSQL_RES **mysql_res);
 static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *mysql_res);
 
 static void Tst_WriteAnswersOfAQstEdit (long QstCod);
-static void Tst_WriteAnswersOfAQstSeeExam (unsigned NumQst,long QstCod,bool Shuffle);
-static void Tst_WriteAnswersOfAQstAssessExam (unsigned NumQst,long QstCod,
+static void Tst_WriteAnswersOfAQstViewTest (unsigned NumQst,long QstCod,bool Shuffle);
+static void Tst_WriteAnswersOfAQstAssessTest (unsigned NumQst,long QstCod,
                                               double *ScoreThisQst,bool *AnswerIsNotBlank);
 static void Tst_WriteFormAnsTF (unsigned NumQst);
-static void Tst_WriteTFAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
+static void Tst_WriteTFAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
                                       double *ScoreThisQst,bool *AnswerIsNotBlank);
-static void Tst_WriteChoiceAnsSeeExam (unsigned NumQst,long QstCod,bool Shuffle);
-static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
+static void Tst_WriteChoiceAnsViewTest (unsigned NumQst,long QstCod,bool Shuffle);
+static void Tst_WriteChoiceAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
                                           double *ScoreThisQst,bool *AnswerIsNotBlank);
-static void Tst_WriteTextAnsSeeExam (unsigned NumQst);
-static void Tst_WriteTextAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
+static void Tst_WriteTextAnsViewTest (unsigned NumQst);
+static void Tst_WriteTextAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
                                         double *ScoreThisQst,bool *AnswerIsNotBlank);
-static void Tst_WriteIntAnsSeeExam (unsigned NumQst);
-static void Tst_WriteIntAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
+static void Tst_WriteIntAnsViewTest (unsigned NumQst);
+static void Tst_WriteIntAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
                                        double *ScoreThisQst,bool *AnswerIsNotBlank);
-static void Tst_WriteFloatAnsSeeExam (unsigned NumQst);
-static void Tst_WriteFloatAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
+static void Tst_WriteFloatAnsViewTest (unsigned NumQst);
+static void Tst_WriteFloatAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
                                          double *ScoreThisQst,bool *AnswerIsNotBlank);
 static void Tst_WriteHeadUserCorrect (void);
 static void Tst_WriteScoreStart (unsigned ColSpan);
@@ -255,19 +255,19 @@ static unsigned Tst_GetNumTstQuestions (Sco_Scope_t Scope,Tst_AnswerType_t AnsTy
 static unsigned Tst_GetNumCoursesWithTstQuestions (Sco_Scope_t Scope,Tst_AnswerType_t AnsType);
 static unsigned Tst_GetNumCoursesWithPluggableTstQuestions (Sco_Scope_t Scope,Tst_AnswerType_t AnsType);
 
-static long Tst_CreateTestExamInDB (void);
-static void Tst_StoreScoreOfTestExamInDB (long TstCod,
+static long Tst_CreateTestResultInDB (void);
+static void Tst_StoreScoreOfTestResultInDB (long TstCod,
                                           unsigned NumQstsNotBlank,double Score);
 static void Tst_ShowHeaderTestResults (void);
-static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat);
-static void Tst_ShowDataUsr (struct UsrData *UsrDat,unsigned NumExams);
+static void Tst_ShowTestResults (struct UsrData *UsrDat);
+static void Tst_ShowDataUsr (struct UsrData *UsrDat,unsigned NumTestResults);
 static void Tst_PutParamTstCod (long TstCod);
 static long Tst_GetParamTstCod (void);
-static void Tst_ShowExamTstResult (time_t TstTimeUTC);
-static void Tst_GetExamDataByTstCod (long TstCod,time_t *TstTimeUTC,
-                                     unsigned *NumQsts,unsigned *NumQstsNotBlank,double *Score);
-static void Tst_StoreOneExamQstInDB (long TstCod,long QstCod,unsigned NumQst,double Score);
-static void Tst_GetExamQuestionsFromDB (long TstCod);
+static void Tst_ShowTestResult (time_t TstTimeUTC);
+static void Tst_GetTestResultDataByTstCod (long TstCod,time_t *TstTimeUTC,
+                                           unsigned *NumQsts,unsigned *NumQstsNotBlank,double *Score);
+static void Tst_StoreOneTestResultQstInDB (long TstCod,long QstCod,unsigned NumQst,double Score);
+static void Tst_GetTestResultQuestionsFromDB (long TstCod);
 
 /*****************************************************************************/
 /*************** Show form to generate a self-assessment test ****************/
@@ -279,7 +279,7 @@ void Tst_ShowFormAskTst (void)
    extern const char *The_ClassForm[The_NUM_THEMES];
    extern const char *Txt_Take_a_test;
    extern const char *Txt_No_of_questions;
-   extern const char *Txt_Generate_exam;
+   extern const char *Txt_Generate_test;
    extern const char *Txt_No_test_questions;
    MYSQL_RES *mysql_res;
    unsigned long NumRows;
@@ -287,15 +287,15 @@ void Tst_ShowFormAskTst (void)
    /***** Read test configuration from database *****/
    Tst_GetConfigTstFromDB ();
 
-   /***** Put link to view tests results (exams) *****/
+   /***** Put link to view tests results *****/
    switch (Gbl.Usrs.Me.LoggedRole)
      {
       case Rol_STUDENT:
-         Tst_PutFormToSeeResultsOfUsersTests (ActReqSeeMyTstExa);
+         Tst_PutFormToViewResultsOfUsersTests (ActReqSeeMyTstRes);
          break;
       case Rol_TEACHER:
       case Rol_SYS_ADM:
-         Tst_PutFormToSeeResultsOfUsersTests (ActReqSeeUsrTstExa);
+         Tst_PutFormToViewResultsOfUsersTests (ActReqSeeUsrTstRes);
 	 break;
       default:
 	 break;
@@ -340,7 +340,7 @@ void Tst_ShowFormAskTst (void)
                             "</table>");
 
          /***** Send button *****/
-         Lay_PutConfirmButton (Txt_Generate_exam);
+         Lay_PutConfirmButton (Txt_Generate_test);
          Act_FormEnd ();
         }
      }
@@ -365,13 +365,13 @@ void Tst_ShowFormAskTst (void)
 /*************** Write a form to go to result of users' tests ****************/
 /*****************************************************************************/
 
-static void Tst_PutFormToSeeResultsOfUsersTests (Act_Action_t Action)
+static void Tst_PutFormToViewResultsOfUsersTests (Act_Action_t Action)
   {
-   extern const char *Txt_Results_tests;
+   extern const char *Txt_Test_results;
 
    fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
    Lay_PutContextualLink (Action,NULL,"exam64x64.png",
-	                  Txt_Results_tests,Txt_Results_tests,
+	                  Txt_Test_results,Txt_Test_results,
 		          NULL);
    fprintf (Gbl.F.Out,"</div>");
   }
@@ -380,14 +380,14 @@ static void Tst_PutFormToSeeResultsOfUsersTests (Act_Action_t Action)
 /********************** Generate self-assessment test ************************/
 /*****************************************************************************/
 
-void Tst_ShowNewTestExam (void)
+void Tst_ShowNewTest (void)
   {
    extern const char *Hlp_ASSESSMENT_Tests;
    extern const char *The_ClassForm[The_NUM_THEMES];
    extern const char *Txt_No_questions_found_matching_your_search_criteria;
    extern const char *Txt_Test;
-   extern const char *Txt_Allow_teachers_to_consult_this_exam;
-   extern const char *Txt_Done_assess_exam;
+   extern const char *Txt_Allow_teachers_to_consult_this_test;
+   extern const char *Txt_Done_assess_test;
    MYSQL_RES *mysql_res;
    unsigned long NumRows;
    unsigned NumAccessesTst;
@@ -401,7 +401,7 @@ void Tst_ShowNewTestExam (void)
       if (Tst_GetParamsTst ())					// Get parameters from form
         {
          /***** Get questions *****/
-         if ((NumRows = Tst_GetQuestionsForExam (&mysql_res)) == 0)	// Query database
+         if ((NumRows = Tst_GetQuestionsForTest (&mysql_res)) == 0)	// Query database
            {
             Lay_ShowAlert (Lay_INFO,Txt_No_questions_found_matching_your_search_criteria);
             Tst_ShowFormAskTst ();					// Show the form again
@@ -431,7 +431,7 @@ void Tst_ShowNewTestExam (void)
             Tst_ShowTestQuestionsWhenSeeing (mysql_res);
 	    fprintf (Gbl.F.Out,"</table>");
 
-	    /***** Exam will be saved? *****/
+	    /***** Test result will be saved? *****/
 	    fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\""
 		               " style=\"margin-top:20px;\">"
 			       "<input type=\"checkbox\" name=\"Save\" value=\"Y\"",
@@ -440,10 +440,10 @@ void Tst_ShowNewTestExam (void)
 	       fprintf (Gbl.F.Out," checked=\"checked\"");
 	    fprintf (Gbl.F.Out," />%s"
 			       "</div>",
-		     Txt_Allow_teachers_to_consult_this_exam);
+		     Txt_Allow_teachers_to_consult_this_test);
 
             /***** End form *****/
-            Lay_PutConfirmButton (Txt_Done_assess_exam);
+            Lay_PutConfirmButton (Txt_Done_assess_test);
             Act_FormEnd ();
 
             /***** End frame *****/
@@ -469,10 +469,10 @@ void Tst_ShowNewTestExam (void)
   }
 
 /*****************************************************************************/
-/****************************** Assess a test exam ***************************/
+/******************************** Assess a test ******************************/
 /*****************************************************************************/
 
-void Tst_AssessTestExam (void)
+void Tst_AssessTest (void)
   {
    extern const char *Hlp_ASSESSMENT_Tests;
    extern const char *Txt_Test_result;
@@ -499,15 +499,15 @@ void Tst_AssessTestExam (void)
          /* Get number of questions */
          Tst_GetParamNumQst ();
 
-         /***** Get if exam must be saved *****/
+         /***** Get if test must be saved *****/
 	 Par_GetParToText ("Save",YN,1);
 	 Gbl.Test.AllowTeachers = (Str_ConvertToUpperLetter (YN[0]) == 'Y');
 
-	 /***** Get questions and answers from form to assess an exam *****/
+	 /***** Get questions and answers from form to assess a test *****/
 	 Tst_GetQuestionsAndAnswersFromForm ();
 
-	 /***** Create new test exam in database to store the result *****/
-	 TstCod = Tst_CreateTestExamInDB ();
+	 /***** Create new test in database to store the result *****/
+	 TstCod = Tst_CreateTestResultInDB ();
 
 	 /***** Start frame *****/
 	 Lay_StartRoundFrame (NULL,Txt_Test_result,NULL,Hlp_ASSESSMENT_Tests);
@@ -526,7 +526,7 @@ void Tst_AssessTestExam (void)
 
 	 /***** Write answers and solutions *****/
 	 fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_10\">");
-	 Tst_ShowTstResultAfterAssess (TstCod,&NumQstsNotBlank,&TotalScore);
+	 Tst_ShowTestResultAfterAssess (TstCod,&NumQstsNotBlank,&TotalScore);
 	 fprintf (Gbl.F.Out,"</table>");
 
 	 /***** Write total mark of test *****/
@@ -537,7 +537,7 @@ void Tst_AssessTestExam (void)
 	 Lay_EndRoundFrame ();
 
 	 /***** Store test result in database *****/
-	 Tst_StoreScoreOfTestExamInDB (TstCod,
+	 Tst_StoreScoreOfTestResultInDB (TstCod,
 				       NumQstsNotBlank,TotalScore);
 
          /***** Set test status *****/
@@ -557,7 +557,7 @@ void Tst_AssessTestExam (void)
   }
 
 /*****************************************************************************/
-/********** Get questions and answers from form to assess an exam ************/
+/*********** Get questions and answers from form to assess a test ************/
 /*****************************************************************************/
 
 static void Tst_GetQuestionsAndAnswersFromForm (void)
@@ -588,7 +588,7 @@ static void Tst_GetQuestionsAndAnswersFromForm (void)
   }
 
 /*****************************************************************************/
-/************************ Show total mark of a test exam *********************/
+/************************** Show total mark of a test ************************/
 /*****************************************************************************/
 
 static void Tst_ShowTstTotalMark (double TotalScore)
@@ -808,17 +808,17 @@ static void Tst_ShowTestQuestionsWhenSeeing (MYSQL_RES *mysql_res)
       if ((QstCod = Str_ConvertStrCodToLongCod (row[0])) < 0)
          Lay_ShowErrorAndExit ("Wrong code of question.");
 
-      Tst_WriteQstAndAnsExam (NumQst,QstCod,row,
+      Tst_WriteQstAndAnsTest (NumQst,QstCod,row,
 	                      &ScoreThisQst,		// Not used here
 	                      &AnswerIsNotBlank);	// Not used here
      }
   }
 
 /*****************************************************************************/
-/************************ Show test tags in this exam ************************/
+/******************** Show test tags in this test result *********************/
 /*****************************************************************************/
 
-static void Tst_ShowTstTagsPresentInAnExam (long TstCod)
+static void Tst_ShowTstTagsPresentInATestResult (long TstCod)
   {
    extern const char *Txt_no_tags;
    char Query[512];
@@ -827,7 +827,7 @@ static void Tst_ShowTstTagsPresentInAnExam (long TstCod)
    unsigned long NumRows;
    unsigned long NumRow;
 
-   /***** Get all tags of questions in this test exam *****/
+   /***** Get all tags of questions in this test *****/
    sprintf (Query,"SELECT tst_tags.TagTxt FROM"
 	          " (SELECT DISTINCT(tst_question_tags.TagCod)"
 	          " FROM tst_question_tags,tst_exam_questions"
@@ -837,7 +837,7 @@ static void Tst_ShowTstTagsPresentInAnExam (long TstCod)
 	          " WHERE TagsCods.TagCod=tst_tags.TagCod"
 	          " ORDER BY tst_tags.TagTxt",
             TstCod);
-   if ((NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get tags present in a test exam")))
+   if ((NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get tags present in a test result")))
      {
       /***** Write the tags *****/
       fprintf (Gbl.F.Out,"<ul>");
@@ -863,7 +863,7 @@ static void Tst_ShowTstTagsPresentInAnExam (long TstCod)
 /******************* Show the result of assessing a test *********************/
 /*****************************************************************************/
 
-static void Tst_ShowTstResultAfterAssess (long TstCod,unsigned *NumQstsNotBlank,double *TotalScore)
+static void Tst_ShowTestResultAfterAssess (long TstCod,unsigned *NumQstsNotBlank,double *TotalScore)
   {
    extern const char *Txt_Question_removed;
    MYSQL_RES *mysql_res;
@@ -907,14 +907,14 @@ static void Tst_ShowTstResultAfterAssess (long TstCod,unsigned *NumQstsNotBlank,
 	 if ((QstCod = Str_ConvertStrCodToLongCod (row[0])) < 0)
 	    Lay_ShowErrorAndExit ("Wrong code of question.");
 
-	 /***** Write questions and answers *****/
-	 Tst_WriteQstAndAnsExam (NumQst,QstCod,row,
+	 /***** Write question and answers *****/
+	 Tst_WriteQstAndAnsTest (NumQst,QstCod,row,
 				 &ScoreThisQst,&AnswerIsNotBlank);
 
-	 /***** Store exam questions in database *****/
-	 Tst_StoreOneExamQstInDB (TstCod,QstCod,
-				  NumQst,	// 0, 1, 2, 3...
-				  ScoreThisQst);
+	 /***** Store test result question in database *****/
+	 Tst_StoreOneTestResultQstInDB (TstCod,QstCod,
+				        NumQst,	// 0, 1, 2, 3...
+				        ScoreThisQst);
 
 	 /***** Compute total score *****/
 	 *TotalScore += ScoreThisQst;
@@ -944,10 +944,10 @@ static void Tst_ShowTstResultAfterAssess (long TstCod,unsigned *NumQstsNotBlank,
   }
 
 /*****************************************************************************/
-/******** Write a row of a test exam, with one question and its answer *******/
+/********** Write a row of a test, with one question and its answer **********/
 /*****************************************************************************/
 
-static void Tst_WriteQstAndAnsExam (unsigned NumQst,long QstCod,MYSQL_ROW row,
+static void Tst_WriteQstAndAnsTest (unsigned NumQst,long QstCod,MYSQL_ROW row,
                                     double *ScoreThisQst,bool *AnswerIsNotBlank)
   {
    extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES];
@@ -994,10 +994,10 @@ static void Tst_WriteQstAndAnsExam (unsigned NumQst,long QstCod,MYSQL_ROW row,
                   "TEST_IMG_SHOW_STEM");
 
    if (Gbl.Action.Act == ActSeeTst)
-      Tst_WriteAnswersOfAQstSeeExam (NumQst,QstCod,(row[3][0] == 'Y'));
-   else	// Assessing exam / Viewing old exam
+      Tst_WriteAnswersOfAQstViewTest (NumQst,QstCod,(row[3][0] == 'Y'));
+   else	// Assessing test / Viewing old test result
      {
-      Tst_WriteAnswersOfAQstAssessExam (NumQst,QstCod,ScoreThisQst,AnswerIsNotBlank);
+      Tst_WriteAnswersOfAQstAssessTest (NumQst,QstCod,ScoreThisQst,AnswerIsNotBlank);
 
       /* Write question feedback (row[5]) */
       if (Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_FULL_FEEDBACK)
@@ -1859,7 +1859,7 @@ static void Tst_ShowFormConfigTst (void)
             The_ClassForm[Gbl.Prefs.Theme],
             Txt_No_of_questions);
 
-   /* Minimum number of questions in a test exam */
+   /* Minimum number of questions in a test */
    fprintf (Gbl.F.Out,"<tr>"
 	              "<td class=\"DAT RIGHT_MIDDLE\">"
 	              "%s"
@@ -1872,7 +1872,7 @@ static void Tst_ShowFormConfigTst (void)
                       "</tr>",
             Txt_minimum,Gbl.Test.Config.Min);
 
-   /* Default number of questions in a test exam */
+   /* Default number of questions in a test */
    fprintf (Gbl.F.Out,"<tr>"
 	              "<td class=\"DAT RIGHT_MIDDLE\">"
 	              "%s"
@@ -1885,7 +1885,7 @@ static void Tst_ShowFormConfigTst (void)
                       "</tr>",
             Txt_default,Gbl.Test.Config.Def);
 
-   /* Maximum number of questions in a test exam */
+   /* Maximum number of questions in a test */
    fprintf (Gbl.F.Out,"<tr>"
 	              "<td class=\"DAT RIGHT_MIDDLE\">"
 	              "%s"
@@ -1901,7 +1901,7 @@ static void Tst_ShowFormConfigTst (void)
                       "</tr>",
             Txt_maximum,Gbl.Test.Config.Max);
 
-   /***** Minimum time between test exams per question *****/
+   /***** Minimum time between consecutive tests, per question *****/
    fprintf (Gbl.F.Out,"<tr>"
 	              "<td class=\"%s RIGHT_MIDDLE\">"
 	              "%s:"
@@ -2029,7 +2029,7 @@ void Tst_GetConfigFromRow (MYSQL_ROW row)
    /***** Check and correct numbers *****/
    Tst_CheckAndCorrectNumbersQst ();
 
-   /***** Get minimum time between test exams per question (row[4]) *****/
+   /***** Get minimum time between consecutive tests, per question (row[4]) *****/
    if (sscanf (row[4],"%ld",&LongNum) == 1)
       Gbl.Test.Config.MinTimeNxtTstPerQst = (LongNum < 1L) ? 0UL :
 	                                                     (unsigned long) LongNum;
@@ -2132,7 +2132,7 @@ void Tst_ReceiveConfigTst (void)
    /* Check and correct numbers */
    Tst_CheckAndCorrectNumbersQst ();
 
-   /***** Get minimum time between test exams per question *****/
+   /***** Get minimum time between consecutive tests, per question *****/
    Par_GetParToText ("MinTimeNxtTstPerQst",IntStr,1+10);
    if (sscanf (IntStr,"%ld",&LongNum) != 1)
       Lay_ShowErrorAndExit ("Minimum time per question between two test is missing.");
@@ -2211,14 +2211,14 @@ static void Tst_CheckAndCorrectNumbersQst (void)
    /***** Check if minimum is correct *****/
    if (Gbl.Test.Config.Min < 1)
       Gbl.Test.Config.Min = 1;
-   else if (Gbl.Test.Config.Min > Tst_MAX_QUESTIONS_PER_EXAM)
-      Gbl.Test.Config.Min = Tst_MAX_QUESTIONS_PER_EXAM;
+   else if (Gbl.Test.Config.Min > Tst_MAX_QUESTIONS_PER_TEST)
+      Gbl.Test.Config.Min = Tst_MAX_QUESTIONS_PER_TEST;
 
    /***** Check if maximum is correct *****/
    if (Gbl.Test.Config.Max < 1)
       Gbl.Test.Config.Max = 1;
-   else if (Gbl.Test.Config.Max > Tst_MAX_QUESTIONS_PER_EXAM)
-      Gbl.Test.Config.Max = Tst_MAX_QUESTIONS_PER_EXAM;
+   else if (Gbl.Test.Config.Max > Tst_MAX_QUESTIONS_PER_TEST)
+      Gbl.Test.Config.Max = Tst_MAX_QUESTIONS_PER_TEST;
 
    /***** Check if minimum is lower than maximum *****/
    if (Gbl.Test.Config.Min > Gbl.Test.Config.Max)
@@ -2486,7 +2486,7 @@ static unsigned long Tst_GetQuestionsForEdit (MYSQL_RES **mysql_res)
 /********* Get from the database several test questions to list them *********/
 /*****************************************************************************/
 
-static unsigned long Tst_GetQuestionsForExam (MYSQL_RES **mysql_res)
+static unsigned long Tst_GetQuestionsForTest (MYSQL_RES **mysql_res)
   {
    char Query[MAX_LENGTH_QUERY_TEST+1];
    long LengthQuery;
@@ -3121,10 +3121,10 @@ static void Tst_WriteAnswersOfAQstEdit (long QstCod)
   }
 
 /*****************************************************************************/
-/**************** Write answers of a question when seeing an exam ************/
+/************** Write answers of a question when viewing a test **************/
 /*****************************************************************************/
 
-static void Tst_WriteAnswersOfAQstSeeExam (unsigned NumQst,long QstCod,bool Shuffle)
+static void Tst_WriteAnswersOfAQstViewTest (unsigned NumQst,long QstCod,bool Shuffle)
   {
    /***** Write parameter with question code *****/
    Tst_WriteParamQstCod (NumQst,QstCod);
@@ -3133,20 +3133,20 @@ static void Tst_WriteAnswersOfAQstSeeExam (unsigned NumQst,long QstCod,bool Shuf
    switch (Gbl.Test.AnswerType)
      {
       case Tst_ANS_INT:
-         Tst_WriteIntAnsSeeExam (NumQst);
+         Tst_WriteIntAnsViewTest (NumQst);
          break;
       case Tst_ANS_FLOAT:
-         Tst_WriteFloatAnsSeeExam (NumQst);
+         Tst_WriteFloatAnsViewTest (NumQst);
          break;
       case Tst_ANS_TRUE_FALSE:
          Tst_WriteFormAnsTF (NumQst);
          break;
       case Tst_ANS_UNIQUE_CHOICE:
       case Tst_ANS_MULTIPLE_CHOICE:
-         Tst_WriteChoiceAnsSeeExam (NumQst,QstCod,Shuffle);
+         Tst_WriteChoiceAnsViewTest (NumQst,QstCod,Shuffle);
          break;
       case Tst_ANS_TEXT:
-         Tst_WriteTextAnsSeeExam (NumQst);
+         Tst_WriteTextAnsViewTest (NumQst);
          break;
       default:
          break;
@@ -3154,10 +3154,10 @@ static void Tst_WriteAnswersOfAQstSeeExam (unsigned NumQst,long QstCod,bool Shuf
   }
 
 /*****************************************************************************/
-/************* Write answers of a question when assessing an exam ************/
+/************* Write answers of a question when assessing a test *************/
 /*****************************************************************************/
 
-static void Tst_WriteAnswersOfAQstAssessExam (unsigned NumQst,long QstCod,
+static void Tst_WriteAnswersOfAQstAssessTest (unsigned NumQst,long QstCod,
                                               double *ScoreThisQst,bool *AnswerIsNotBlank)
   {
    MYSQL_RES *mysql_res;
@@ -3177,20 +3177,20 @@ static void Tst_WriteAnswersOfAQstAssessExam (unsigned NumQst,long QstCod,
    switch (Gbl.Test.AnswerType)
      {
       case Tst_ANS_INT:
-         Tst_WriteIntAnsAssessExam (NumQst,mysql_res,ScoreThisQst,AnswerIsNotBlank);
+         Tst_WriteIntAnsAssessTest (NumQst,mysql_res,ScoreThisQst,AnswerIsNotBlank);
          break;
       case Tst_ANS_FLOAT:
-         Tst_WriteFloatAnsAssessExam (NumQst,mysql_res,ScoreThisQst,AnswerIsNotBlank);
+         Tst_WriteFloatAnsAssessTest (NumQst,mysql_res,ScoreThisQst,AnswerIsNotBlank);
          break;
       case Tst_ANS_TRUE_FALSE:
-         Tst_WriteTFAnsAssessExam (NumQst,mysql_res,ScoreThisQst,AnswerIsNotBlank);
+         Tst_WriteTFAnsAssessTest (NumQst,mysql_res,ScoreThisQst,AnswerIsNotBlank);
          break;
       case Tst_ANS_UNIQUE_CHOICE:
       case Tst_ANS_MULTIPLE_CHOICE:
-         Tst_WriteChoiceAnsAssessExam (NumQst,mysql_res,ScoreThisQst,AnswerIsNotBlank);
+         Tst_WriteChoiceAnsAssessTest (NumQst,mysql_res,ScoreThisQst,AnswerIsNotBlank);
          break;
       case Tst_ANS_TEXT:
-         Tst_WriteTextAnsAssessExam (NumQst,mysql_res,ScoreThisQst,AnswerIsNotBlank);
+         Tst_WriteTextAnsAssessTest (NumQst,mysql_res,ScoreThisQst,AnswerIsNotBlank);
          break;
       default:
          break;
@@ -3201,7 +3201,7 @@ static void Tst_WriteAnswersOfAQstAssessExam (unsigned NumQst,long QstCod,
   }
 
 /*****************************************************************************/
-/************** Write false / true answer when seeing an exam ****************/
+/************** Write false / true answer when viewing a test ****************/
 /*****************************************************************************/
 
 static void Tst_WriteFormAnsTF (unsigned NumQst)
@@ -3220,7 +3220,7 @@ static void Tst_WriteFormAnsTF (unsigned NumQst)
   }
 
 /*****************************************************************************/
-/************** Write false / true answer when seeing an exam ****************/
+/************** Write false / true answer when viewing a test ****************/
 /*****************************************************************************/
 
 void Tst_WriteAnsTF (char AnsTF)
@@ -3242,10 +3242,10 @@ void Tst_WriteAnsTF (char AnsTF)
   }
 
 /*****************************************************************************/
-/************* Write false / true answer when assessing an exam **************/
+/************** Write false / true answer when assessing a test **************/
 /*****************************************************************************/
 
-static void Tst_WriteTFAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
+static void Tst_WriteTFAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
                                       double *ScoreThisQst,bool *AnswerIsNotBlank)
   {
    MYSQL_ROW row;
@@ -3327,10 +3327,10 @@ static void Tst_WriteTFAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
   }
 
 /*****************************************************************************/
-/******** Write single or multiple choice answer when seeing an exam *********/
+/******** Write single or multiple choice answer when viewing a test *********/
 /*****************************************************************************/
 
-static void Tst_WriteChoiceAnsSeeExam (unsigned NumQst,long QstCod,bool Shuffle)
+static void Tst_WriteChoiceAnsViewTest (unsigned NumQst,long QstCod,bool Shuffle)
   {
    unsigned NumOpt;
    MYSQL_RES *mysql_res;
@@ -3375,7 +3375,7 @@ static void Tst_WriteChoiceAnsSeeExam (unsigned NumQst,long QstCod,bool Shuffle)
       else
          ErrorInIndex = true;
       if (ErrorInIndex)
-         Lay_ShowErrorAndExit ("Wrong index of answer when showing an exam.");
+         Lay_ShowErrorAndExit ("Wrong index of answer when showing a test.");
 
       /***** Copy text (row[1]) and convert it, that is in HTML, to rigorous HTML ******/
       strncpy (Gbl.Test.Answer.Options[NumOpt].Text,row[1],Tst_MAX_BYTES_ANSWER_OR_FEEDBACK);
@@ -3423,10 +3423,10 @@ static void Tst_WriteChoiceAnsSeeExam (unsigned NumQst,long QstCod,bool Shuffle)
   }
 
 /*****************************************************************************/
-/******* Write single or multiple choice answer when assessing an exam *******/
+/******* Write single or multiple choice answer when assessing a test ********/
 /*****************************************************************************/
 
-static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
+static void Tst_WriteChoiceAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
                                           double *ScoreThisQst,bool *AnswerIsNotBlank)
   {
    extern const char *Txt_TEST_User_answer;
@@ -3498,7 +3498,7 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
      {
       Par_GetNextStrUntilSeparParamMult (&Ptr,StrOneIndex,10);
       if (sscanf (StrOneIndex,"%u",&(Indexes[NumOpt])) != 1)
-         Lay_ShowErrorAndExit ("Wrong index of answer when assessing an exam.");
+         Lay_ShowErrorAndExit ("Wrong index of answer when assessing a test.");
      }
 
    /***** Get the user's answers for this question from string *****/
@@ -3661,10 +3661,10 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
   }
 
 /*****************************************************************************/
-/******************** Write text answer when seeing an exam ******************/
+/******************** Write text answer when viewing a test ******************/
 /*****************************************************************************/
 
-static void Tst_WriteTextAnsSeeExam (unsigned NumQst)
+static void Tst_WriteTextAnsViewTest (unsigned NumQst)
   {
    /***** Write input field for the answer *****/
    fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Ans%06u\""
@@ -3673,10 +3673,10 @@ static void Tst_WriteTextAnsSeeExam (unsigned NumQst)
   }
 
 /*****************************************************************************/
-/***************** Write text answer when assessing an exam ******************/
+/***************** Write text answer when assessing a test *******************/
 /*****************************************************************************/
 
-static void Tst_WriteTextAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
+static void Tst_WriteTextAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
                                         double *ScoreThisQst,bool *AnswerIsNotBlank)
   {
    unsigned NumOpt;
@@ -3843,10 +3843,10 @@ static void Tst_WriteTextAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
   }
 
 /*****************************************************************************/
-/****************** Write integer answer when seeing an exam *****************/
+/****************** Write integer answer when viewing a test *****************/
 /*****************************************************************************/
 
-static void Tst_WriteIntAnsSeeExam (unsigned NumQst)
+static void Tst_WriteIntAnsViewTest (unsigned NumQst)
   {
    /***** Write input field for the answer *****/
    fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Ans%06u\""
@@ -3855,10 +3855,10 @@ static void Tst_WriteIntAnsSeeExam (unsigned NumQst)
   }
 
 /*****************************************************************************/
-/**************** Write integer answer when assessing an exam ****************/
+/**************** Write integer answer when assessing a test *****************/
 /*****************************************************************************/
 
-static void Tst_WriteIntAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
+static void Tst_WriteIntAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
                                        double *ScoreThisQst,bool *AnswerIsNotBlank)
   {
    MYSQL_ROW row;
@@ -3955,10 +3955,10 @@ static void Tst_WriteIntAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
   }
 
 /*****************************************************************************/
-/****************** Write float answer when seeing an exam *******************/
+/****************** Write float answer when viewing a test *******************/
 /*****************************************************************************/
 
-static void Tst_WriteFloatAnsSeeExam (unsigned NumQst)
+static void Tst_WriteFloatAnsViewTest (unsigned NumQst)
   {
    /***** Write input field for the answer *****/
    fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Ans%06u\""
@@ -3967,10 +3967,10 @@ static void Tst_WriteFloatAnsSeeExam (unsigned NumQst)
   }
 
 /*****************************************************************************/
-/***************** Write float answer when assessing an exam *****************/
+/***************** Write float answer when assessing a test ******************/
 /*****************************************************************************/
 
-static void Tst_WriteFloatAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
+static void Tst_WriteFloatAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
                                          double *ScoreThisQst,bool *AnswerIsNotBlank)
   {
    MYSQL_ROW row;
@@ -4286,7 +4286,7 @@ static unsigned Tst_GetAndCheckParamNumTst (void)
    char IntStr[1+10+1];
    int IntNum;
 
-   /***** Get number of test exam *****/
+   /***** Get number of test *****/
    Par_GetParToText ("NumTst",IntStr,10);
    if (!IntStr[0])
       Lay_ShowErrorAndExit ("Number of test is missing.");
@@ -6863,15 +6863,15 @@ static unsigned Tst_GetNumCoursesWithPluggableTstQuestions (Sco_Scope_t Scope,Ts
   }
 
 /*****************************************************************************/
-/******* Select users and dates to show their results in test exams **********/
+/************ Select users and dates to show their test results **************/
 /*****************************************************************************/
 
-void Tst_SelUsrsToSeeUsrsExams (void)
+void Tst_SelUsrsToSeeUsrsTestResults (void)
   {
    extern const char *The_ClassForm[The_NUM_THEMES];
-   extern const char *Txt_Exams;
+   extern const char *Txt_Test_results;
    extern const char *Txt_Users;
-   extern const char *Txt_View_exams;
+   extern const char *Txt_View_test_results;
    unsigned NumTotalUsrs;
 
    /***** Get and update type of list,
@@ -6880,7 +6880,7 @@ void Tst_SelUsrsToSeeUsrsExams (void)
    Usr_GetAndUpdatePrefsAboutUsrList ();
 
    /***** Show form to select the groups *****/
-   Grp_ShowFormToSelectSeveralGroups (ActReqSeeUsrTstExa);
+   Grp_ShowFormToSelectSeveralGroups (ActReqSeeUsrTstRes);
 
    /***** Get and order lists of users from this course *****/
    Usr_GetListUsrs (Rol_TEACHER,Sco_SCOPE_CRS);
@@ -6893,13 +6893,13 @@ void Tst_SelUsrsToSeeUsrsExams (void)
       if (Usr_GetIfShowBigList (NumTotalUsrs,NULL))
         {
          /***** Start frame *****/
-         Lay_StartRoundFrame (NULL,Txt_Exams,NULL,NULL);
+         Lay_StartRoundFrame (NULL,Txt_Test_results,NULL,NULL);
 
 	 /***** Form to select type of list used for select several users *****/
-	 Usr_ShowFormsToSelectUsrListType (ActReqSeeUsrTstExa);
+	 Usr_ShowFormsToSelectUsrListType (ActReqSeeUsrTstRes);
 
          /***** Start form *****/
-         Act_FormStart (ActSeeUsrTstExa);
+         Act_FormStart (ActSeeUsrTstRes);
          Grp_PutParamsCodGrps ();
 
          /***** Put list of users to select some of them *****/
@@ -6925,7 +6925,7 @@ void Tst_SelUsrsToSeeUsrsExams (void)
          fprintf (Gbl.F.Out,"</table>");
 
          /***** Send button *****/
-	 Lay_PutConfirmButton (Txt_View_exams);
+	 Lay_PutConfirmButton (Txt_View_test_results);
 
          /***** End form *****/
          Act_FormEnd ();
@@ -6949,24 +6949,24 @@ void Tst_SelUsrsToSeeUsrsExams (void)
   }
 
 /*****************************************************************************/
-/************** Select dates to show my results in test exams ****************/
+/******************* Select dates to show my test results ********************/
 /*****************************************************************************/
 
-void Tst_SelDatesToSeeMyExams (void)
+void Tst_SelDatesToSeeMyTestResults (void)
   {
    extern const char *Hlp_ASSESSMENT_Tests;
-   extern const char *Txt_Exams;
-   extern const char *Txt_View_exams;
+   extern const char *Txt_Test_results;
+   extern const char *Txt_View_test_results;
 
    /***** Start form *****/
-   Act_FormStart (ActSeeMyTstExa);
+   Act_FormStart (ActSeeMyTstRes);
 
    /***** Starting and ending dates in the search *****/
-   Lay_StartRoundFrameTable (NULL,Txt_Exams,NULL,Hlp_ASSESSMENT_Tests,2);
+   Lay_StartRoundFrameTable (NULL,Txt_Test_results,NULL,Hlp_ASSESSMENT_Tests,2);
    Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday ();
 
    /***** Send button and end frame *****/
-   Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_View_exams);
+   Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_View_test_results);
 
    /***** End form *****/
    Act_FormEnd ();
@@ -6976,31 +6976,32 @@ void Tst_SelDatesToSeeMyExams (void)
 /********************* Store test result in database *************************/
 /*****************************************************************************/
 
-static long Tst_CreateTestExamInDB (void)
+static long Tst_CreateTestResultInDB (void)
   {
    char Query[256];
 
-   /***** Insert new tag into tst_tags table *****/
-   sprintf (Query,"INSERT INTO tst_exams (CrsCod,UsrCod,AllowTeachers,TstTime,NumQsts)"
+   /***** Insert new test result into table *****/
+   sprintf (Query,"INSERT INTO tst_exams"
+	          " (CrsCod,UsrCod,AllowTeachers,TstTime,NumQsts)"
                   " VALUES ('%ld','%ld','%c',NOW(),'%u')",
             Gbl.CurrentCrs.Crs.CrsCod,
             Gbl.Usrs.Me.UsrDat.UsrCod,
             Gbl.Test.AllowTeachers ? 'Y' :
         	                     'N',
             Gbl.Test.NumQsts);
-   return DB_QueryINSERTandReturnCode (Query,"can not create new test exam");
+   return DB_QueryINSERTandReturnCode (Query,"can not create new test result");
   }
 
 /*****************************************************************************/
 /********************* Store test result in database *************************/
 /*****************************************************************************/
 
-static void Tst_StoreScoreOfTestExamInDB (long TstCod,
+static void Tst_StoreScoreOfTestResultInDB (long TstCod,
                                           unsigned NumQstsNotBlank,double Score)
   {
    char Query[256];
 
-   /***** Update score in test exam *****/
+   /***** Update score in test result *****/
    Str_SetDecimalPointToUS ();	// To print the floating point as a dot
    sprintf (Query,"UPDATE tst_exams"
 	          " SET NumQstsNotBlank='%u',Score='%lf'"
@@ -7008,17 +7009,17 @@ static void Tst_StoreScoreOfTestExamInDB (long TstCod,
             NumQstsNotBlank,Score,
             TstCod);
    Str_SetDecimalPointToLocal ();	// Return to local system
-   DB_QueryUPDATE (Query,"can not update result of test exam");
+   DB_QueryUPDATE (Query,"can not update result of test result");
   }
 
 /*****************************************************************************/
-/*************** Show results in test exams for several users ****************/
+/******************** Show test results for several users ********************/
 /*****************************************************************************/
 
-void Tst_ShowUsrsExams (void)
+void Tst_ShowUsrsTestResults (void)
   {
    extern const char *Hlp_ASSESSMENT_Tests;
-   extern const char *Txt_Exams;
+   extern const char *Txt_Test_results;
    extern const char *Txt_You_must_select_one_ore_more_users;
    const char *Ptr;
 
@@ -7032,7 +7033,7 @@ void Tst_ShowUsrsExams (void)
    if (Usr_CountNumUsrsInListOfSelectedUsrs ())	// If some users are selected...
      {
       /***** Header of the table with the list of users *****/
-      Lay_StartRoundFrameTable (NULL,Txt_Exams,NULL,Hlp_ASSESSMENT_Tests,2);
+      Lay_StartRoundFrameTable (NULL,Txt_Test_results,NULL,Hlp_ASSESSMENT_Tests,2);
       Tst_ShowHeaderTestResults ();
 
       /***** List the assignments and works of the selected users *****/
@@ -7045,8 +7046,8 @@ void Tst_ShowUsrsExams (void)
 	    if (Usr_CheckIfUsrBelongsToCrs (Gbl.Usrs.Other.UsrDat.UsrCod,
 	                                    Gbl.CurrentCrs.Crs.CrsCod,
 	                                    false))
-	       /***** Show the result of test exams *****/
-	       Tst_ShowResultsOfTestExams (&Gbl.Usrs.Other.UsrDat);
+	       /***** Show test results *****/
+	       Tst_ShowTestResults (&Gbl.Usrs.Other.UsrDat);
 	}
 
       /***** End of the table *****/
@@ -7057,7 +7058,7 @@ void Tst_ShowUsrsExams (void)
       // ...write warning alert
       Lay_ShowAlert (Lay_WARNING,Txt_You_must_select_one_ore_more_users);
       // ...and show again the form
-      Tst_SelUsrsToSeeUsrsExams ();
+      Tst_SelUsrsToSeeUsrsTestResults ();
      }
 
    /***** Free memory used by list of selected users' codes *****/
@@ -7065,7 +7066,7 @@ void Tst_ShowUsrsExams (void)
   }
 
 /*****************************************************************************/
-/************************ Show my results in test exams **********************/
+/*********************** Show header of my test results **********************/
 /*****************************************************************************/
 
 static void Tst_ShowHeaderTestResults (void)
@@ -7113,55 +7114,55 @@ static void Tst_ShowHeaderTestResults (void)
   }
 
 /*****************************************************************************/
-/************************ Show my results in test exams **********************/
+/***************************** Show my test results **************************/
 /*****************************************************************************/
 
-void Tst_ShowMyExams (void)
+void Tst_ShowMyTestResults (void)
   {
    extern const char *Hlp_ASSESSMENT_Tests;
-   extern const char *Txt_Exams;
+   extern const char *Txt_Test_results;
 
    /***** Get starting and ending dates *****/
    Dat_GetIniEndDatesFromForm ();
 
    /***** Header of the table with the list of users *****/
-   Lay_StartRoundFrameTable (NULL,Txt_Exams,NULL,Hlp_ASSESSMENT_Tests,2);
+   Lay_StartRoundFrameTable (NULL,Txt_Test_results,NULL,Hlp_ASSESSMENT_Tests,2);
    Tst_ShowHeaderTestResults ();
 
-   /***** List my results in test exams *****/
+   /***** List my test results *****/
    Tst_GetConfigTstFromDB ();	// To get feedback type
-   Tst_ShowResultsOfTestExams (&Gbl.Usrs.Me.UsrDat);
+   Tst_ShowTestResults (&Gbl.Usrs.Me.UsrDat);
 
    /***** End of the table *****/
    Lay_EndRoundFrameTable ();
   }
 
 /*****************************************************************************/
-/****** Show the results of test exams of a user in the current course *******/
+/*********** Show the test results of a user in the current course ***********/
 /*****************************************************************************/
 
-static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
+static void Tst_ShowTestResults (struct UsrData *UsrDat)
   {
    extern const char *Txt_Today;
-   extern const char *Txt_Visible_exams;
-   extern const char *Txt_See_exam;
+   extern const char *Txt_Visible_tests;
+   extern const char *Txt_View_test;
    char Query[512];
    MYSQL_RES *mysql_res;
    MYSQL_ROW row;
-   unsigned NumExams;
-   unsigned NumExam;
+   unsigned NumTestResults;
+   unsigned NumTest;
    static unsigned UniqueId = 0;
    long TstCod;
-   unsigned NumQstsInThisExam;
-   unsigned NumQstsNotBlankInThisExam;
+   unsigned NumQstsInThisTest;
+   unsigned NumQstsNotBlankInThisTest;
    unsigned NumTotalQsts = 0;
    unsigned NumTotalQstsNotBlank = 0;
-   double ScoreInThisExam;
-   double TotalScoreOfAllExams = 0.0;
-   unsigned NumExamsVisibleByTchs = 0;
+   double ScoreInThisTest;
+   double TotalScoreOfAllTests = 0.0;
+   unsigned NumTestResultsVisibleByTchs = 0;
    bool ItsMe = (UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
    bool IAmATeacher = (Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER);
-   bool ICanViewExam;
+   bool ICanViewTest;
    bool ICanViewScore;
    time_t TimeUTC;
    char *ClassDat;
@@ -7179,34 +7180,34 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
             UsrDat->UsrCod,
             (long) Gbl.DateRange.TimeUTC[0],
             (long) Gbl.DateRange.TimeUTC[1]);
-   NumExams = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get test exams of a user");
+   NumTestResults = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get test exams of a user");
 
    /***** Show user's data *****/
    fprintf (Gbl.F.Out,"<tr>");
-   Tst_ShowDataUsr (UsrDat,NumExams);
+   Tst_ShowDataUsr (UsrDat,NumTestResults);
 
-   /***** Get and print exams results *****/
-   if (NumExams)
+   /***** Get and print test results *****/
+   if (NumTestResults)
      {
-      for (NumExam = 0;
-           NumExam < NumExams;
-           NumExam++)
+      for (NumTest = 0;
+           NumTest < NumTestResults;
+           NumTest++)
         {
          row = mysql_fetch_row (mysql_res);
 
          /* Get test code (row[0]) */
 	 if ((TstCod = Str_ConvertStrCodToLongCod (row[0])) < 0)
-	    Lay_ShowErrorAndExit ("Wrong code of test exam.");
+	    Lay_ShowErrorAndExit ("Wrong code of test result.");
 
-	 /* Get if teachers are allowed to see this test exam (row[1]) */
+	 /* Get if teachers are allowed to see this test result (row[1]) */
 	 Gbl.Test.AllowTeachers = (row[1][0] == 'Y');
 	 ClassDat = Gbl.Test.AllowTeachers ? "DAT" :
 	                                     "DAT_LIGHT";
-	 ICanViewExam = ItsMe || Gbl.Test.AllowTeachers;
-	 ICanViewScore = ICanViewExam && (IAmATeacher ||
+	 ICanViewTest = ItsMe || Gbl.Test.AllowTeachers;
+	 ICanViewScore = ICanViewTest && (IAmATeacher ||
 	                                  Gbl.Test.Config.FeedbackType != Tst_FEEDBACK_NOTHING);
 
-         if (NumExam)
+         if (NumTest)
             fprintf (Gbl.F.Out,"<tr>");
 
          /* Write date and time (row[2] holds UTC date-time) */
@@ -7221,53 +7222,53 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
 	          UniqueId,(long) TimeUTC,Txt_Today);
 
          /* Get number of questions (row[3]) */
-         if (sscanf (row[3],"%u",&NumQstsInThisExam) == 1)
+         if (sscanf (row[3],"%u",&NumQstsInThisTest) == 1)
            {
             if (Gbl.Test.AllowTeachers)
-               NumTotalQsts += NumQstsInThisExam;
+               NumTotalQsts += NumQstsInThisTest;
            }
          else
-            NumQstsInThisExam = 0;
+            NumQstsInThisTest = 0;
 
          /* Get number of questions not blank (row[4]) */
-         if (sscanf (row[4],"%u",&NumQstsNotBlankInThisExam) == 1)
+         if (sscanf (row[4],"%u",&NumQstsNotBlankInThisTest) == 1)
            {
             if (Gbl.Test.AllowTeachers)
-               NumTotalQstsNotBlank += NumQstsNotBlankInThisExam;
+               NumTotalQstsNotBlank += NumQstsNotBlankInThisTest;
            }
          else
-            NumQstsNotBlankInThisExam = 0;
+            NumQstsNotBlankInThisTest = 0;
 
          /* Get score (row[5]) */
 	 Str_SetDecimalPointToUS ();		// To get the decimal point as a dot
-         if (sscanf (row[5],"%lf",&ScoreInThisExam) == 1)
+         if (sscanf (row[5],"%lf",&ScoreInThisTest) == 1)
            {
             if (Gbl.Test.AllowTeachers)
-               TotalScoreOfAllExams += ScoreInThisExam;
+               TotalScoreOfAllTests += ScoreInThisTest;
            }
          else
-            ScoreInThisExam = 0.0;
+            ScoreInThisTest = 0.0;
          Str_SetDecimalPointToLocal ();	// Return to local system
 
          /* Write number of questions */
 	 fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP COLOR%u\">",
 	          ClassDat,Gbl.RowEvenOdd);
-	 if (ICanViewExam)
-	    fprintf (Gbl.F.Out,"%u",NumQstsInThisExam);
+	 if (ICanViewTest)
+	    fprintf (Gbl.F.Out,"%u",NumQstsInThisTest);
 	 fprintf (Gbl.F.Out,"</td>");
 
          /* Write number of questions not blank */
 	 fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP COLOR%u\">",
 	          ClassDat,Gbl.RowEvenOdd);
-	 if (ICanViewExam)
-	    fprintf (Gbl.F.Out,"%u",NumQstsNotBlankInThisExam);
+	 if (ICanViewTest)
+	    fprintf (Gbl.F.Out,"%u",NumQstsNotBlankInThisTest);
 	 fprintf (Gbl.F.Out,"</td>");
 
 	 /* Write score */
 	 fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_TOP COLOR%u\">",
 	          ClassDat,Gbl.RowEvenOdd);
 	 if (ICanViewScore)
-	    fprintf (Gbl.F.Out,"%.2lf",ScoreInThisExam);
+	    fprintf (Gbl.F.Out,"%.2lf",ScoreInThisTest);
 	 fprintf (Gbl.F.Out,"</td>");
 
          /* Write average score per question */
@@ -7275,7 +7276,7 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
 	          ClassDat,Gbl.RowEvenOdd);
 	 if (ICanViewScore)
 	    fprintf (Gbl.F.Out,"%.2lf",
-		     NumQstsInThisExam ? ScoreInThisExam / (double) NumQstsInThisExam :
+		     NumQstsInThisTest ? ScoreInThisTest / (double) NumQstsInThisTest :
 			                 0.0);
 	 fprintf (Gbl.F.Out,"</td>");
 
@@ -7284,35 +7285,35 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
 	          ClassDat,Gbl.RowEvenOdd);
 	 if (ICanViewScore)
 	    fprintf (Gbl.F.Out,"%.2lf",
-		     NumQstsInThisExam ? ScoreInThisExam * Tst_SCORE_MAX / (double) NumQstsInThisExam :
+		     NumQstsInThisTest ? ScoreInThisTest * Tst_SCORE_MAX / (double) NumQstsInThisTest :
 			                 0.0);
 	 fprintf (Gbl.F.Out,"</td>");
 
-	 /* Link to show this exam */
+	 /* Link to show this result */
 	 fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP COLOR%u\">",
 		  Gbl.RowEvenOdd);
-	 if (ICanViewExam)
+	 if (ICanViewTest)
 	   {
-	    Act_FormStart (Gbl.Action.Act == ActSeeMyTstExa ? ActSeeOneTstExaMe :
-						              ActSeeOneTstExaOth);
+	    Act_FormStart (Gbl.Action.Act == ActSeeMyTstRes ? ActSeeOneTstResMe :
+						              ActSeeOneTstResOth);
 	    Tst_PutParamTstCod (TstCod);
 	    fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/exam64x64.png\""
 			       " alt=\"%s\" title=\"%s\""
 			       " class=\"ICO20x20B\" />",
 		     Gbl.Prefs.IconsURL,
-		     Txt_See_exam,
-		     Txt_See_exam);
+		     Txt_View_test,
+		     Txt_View_test);
 	    Act_FormEnd ();
 	   }
 	 fprintf (Gbl.F.Out,"</td>"
                             "</tr>");
 
 	 if (Gbl.Test.AllowTeachers)
-            NumExamsVisibleByTchs++;
+            NumTestResultsVisibleByTchs++;
         }
 
       /***** Write totals for this user *****/
-      ICanViewScore = NumExamsVisibleByTchs && (IAmATeacher ||
+      ICanViewScore = NumTestResultsVisibleByTchs && (IAmATeacher ||
 	                                        Gbl.Test.Config.FeedbackType != Tst_FEEDBACK_NOTHING);
 
       fprintf (Gbl.F.Out,"<tr>"
@@ -7320,19 +7321,19 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
 			 "%s: %u"
 			 "</td>",
 	       Gbl.RowEvenOdd,
-	       Txt_Visible_exams,NumExamsVisibleByTchs);
+	       Txt_Visible_tests,NumTestResultsVisibleByTchs);
 
       /* Write total number of questions */
       fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
 	       Gbl.RowEvenOdd);
-      if (NumExamsVisibleByTchs)
+      if (NumTestResultsVisibleByTchs)
          fprintf (Gbl.F.Out,"%u",NumTotalQsts);
       fprintf (Gbl.F.Out,"</td>");
 
       /* Write total number of questions not blank */
       fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
 	       Gbl.RowEvenOdd);
-      if (NumExamsVisibleByTchs)
+      if (NumTestResultsVisibleByTchs)
          fprintf (Gbl.F.Out,"%u",NumTotalQstsNotBlank);
       fprintf (Gbl.F.Out,"</td>");
 
@@ -7340,7 +7341,7 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
       fprintf (Gbl.F.Out,"<td class=\"DAT_N_LINE_TOP RIGHT_MIDDLE COLOR%u\">",
 	       Gbl.RowEvenOdd);
       if (ICanViewScore)
-         fprintf (Gbl.F.Out,"%.2lf",TotalScoreOfAllExams);
+         fprintf (Gbl.F.Out,"%.2lf",TotalScoreOfAllTests);
       fprintf (Gbl.F.Out,"</td>");
 
       /* Write average score per question */
@@ -7348,7 +7349,7 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
 	       Gbl.RowEvenOdd);
       if (ICanViewScore)
          fprintf (Gbl.F.Out,"%.2lf",
-                  NumTotalQsts ? TotalScoreOfAllExams / (double) NumTotalQsts :
+                  NumTotalQsts ? TotalScoreOfAllTests / (double) NumTotalQsts :
                 	         0.0);
       fprintf (Gbl.F.Out,"</td>");
 
@@ -7357,7 +7358,8 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
 	       Gbl.RowEvenOdd);
       if (ICanViewScore)
          fprintf (Gbl.F.Out,"%.2lf",
-                  NumTotalQsts ? TotalScoreOfAllExams * Tst_SCORE_MAX / (double) NumTotalQsts :
+                  NumTotalQsts ? TotalScoreOfAllTests * Tst_SCORE_MAX /
+                	         (double) NumTotalQsts :
                 	         0.0);
       fprintf (Gbl.F.Out,"</td>");
 
@@ -7393,15 +7395,15 @@ static void Tst_ShowResultsOfTestExams (struct UsrData *UsrDat)
 /******************** Show a row with the data of a user *********************/
 /*****************************************************************************/
 
-static void Tst_ShowDataUsr (struct UsrData *UsrDat,unsigned NumExams)
+static void Tst_ShowDataUsr (struct UsrData *UsrDat,unsigned NumTestResults)
   {
    bool ShowPhoto;
    char PhotoURL[PATH_MAX+1];
 
    /***** Show user's photo and name *****/
    fprintf (Gbl.F.Out,"<td ");
-   if (NumExams)
-      fprintf (Gbl.F.Out,"rowspan=\"%u\"",NumExams + 1);
+   if (NumTestResults)
+      fprintf (Gbl.F.Out,"rowspan=\"%u\"",NumTestResults + 1);
    fprintf (Gbl.F.Out," class=\"LEFT_TOP COLOR%u\">",
 	    Gbl.RowEvenOdd);
    ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
@@ -7412,8 +7414,8 @@ static void Tst_ShowDataUsr (struct UsrData *UsrDat,unsigned NumExams)
 
    /***** Start form to go to user's record card *****/
    fprintf (Gbl.F.Out,"<td ");
-   if (NumExams)
-      fprintf (Gbl.F.Out,"rowspan=\"%u\"",NumExams + 1);
+   if (NumTestResults)
+      fprintf (Gbl.F.Out,"rowspan=\"%u\"",NumTestResults + 1);
    fprintf (Gbl.F.Out," class=\"LEFT_TOP COLOR%u\">",
 	    Gbl.RowEvenOdd);
    Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd :
@@ -7437,7 +7439,7 @@ static void Tst_ShowDataUsr (struct UsrData *UsrDat,unsigned NumExams)
   }
 
 /*****************************************************************************/
-/***************** Write parameter with code of test exam ********************/
+/******************** Write parameter with code of test **********************/
 /*****************************************************************************/
 
 static void Tst_PutParamTstCod (long TstCod)
@@ -7446,23 +7448,23 @@ static void Tst_PutParamTstCod (long TstCod)
   }
 
 /*****************************************************************************/
-/****************** Get parameter with code of test exam *********************/
+/********************* Get parameter with code of test ***********************/
 /*****************************************************************************/
 
 static long Tst_GetParamTstCod (void)
   {
    char LongStr[1+10+1];
 
-   /***** Get parameter with code of test exam *****/
+   /***** Get parameter with code of test *****/
    Par_GetParToText ("TstCod",LongStr,1+10);
    return Str_ConvertStrCodToLongCod (LongStr);
   }
 
 /*****************************************************************************/
-/******************* Show one test exam of another user **********************/
+/******************* Show one test result of another user ********************/
 /*****************************************************************************/
 
-void Tst_ShowOneExam (void)
+void Tst_ShowOneTestResult (void)
   {
    extern const char *Hlp_ASSESSMENT_Tests;
    extern const char *Txt_Test_result;
@@ -7475,26 +7477,26 @@ void Tst_ShowOneExam (void)
    extern const char *Txt_out_of_PART_OF_A_SCORE;
    extern const char *Txt_Tags;
    long TstCod;
-   time_t TstTimeUTC = 0;	// Test exam UTC date-time, initialized to avoid warning
+   time_t TstTimeUTC = 0;	// Test result UTC date-time, initialized to avoid warning
    unsigned NumQstsNotBlank;
    double TotalScore;
    bool ShowPhoto;
    char PhotoURL[PATH_MAX+1];
    bool ICanViewScore;
 
-   /***** Get the code of the test exam *****/
+   /***** Get the code of the test *****/
    if ((TstCod = Tst_GetParamTstCod ()) == -1L)
-      Lay_ShowErrorAndExit ("Code of test exam is missing.");
+      Lay_ShowErrorAndExit ("Code of test is missing.");
 
-   /***** Get exam data and check if I can view this test exam) *****/
-   Tst_GetExamDataByTstCod (TstCod,&TstTimeUTC,&Gbl.Test.NumQsts,&NumQstsNotBlank,&TotalScore);
+   /***** Get test result data and check if I can view this test result) *****/
+   Tst_GetTestResultDataByTstCod (TstCod,&TstTimeUTC,&Gbl.Test.NumQsts,&NumQstsNotBlank,&TotalScore);
    Gbl.Test.Config.FeedbackType = Tst_FEEDBACK_FULL_FEEDBACK;   // Initialize feedback to maximum
    ICanViewScore = true;
    switch (Gbl.Action.Act)
      {
-      case ActSeeOneTstExaMe:
-	 if (Gbl.Usrs.Other.UsrDat.UsrCod != Gbl.Usrs.Me.UsrDat.UsrCod)		// The exam is not mine
-	    Lay_ShowErrorAndExit ("You can not view this test exam.");
+      case ActSeeOneTstResMe:
+	 if (Gbl.Usrs.Other.UsrDat.UsrCod != Gbl.Usrs.Me.UsrDat.UsrCod)		// The test result is not mine
+	    Lay_ShowErrorAndExit ("You can not view this test result.");
 	 if (Gbl.Usrs.Me.LoggedRole < Rol_TEACHER)
 	   {
 	    // Students only can view score if feedback type allows it
@@ -7502,17 +7504,17 @@ void Tst_ShowOneExam (void)
             ICanViewScore = (Gbl.Test.Config.FeedbackType != Tst_FEEDBACK_NOTHING);
 	   }
 	 break;
-      case ActSeeOneTstExaOth:
-	 if (Gbl.Usrs.Other.UsrDat.UsrCod != Gbl.Usrs.Me.UsrDat.UsrCod &&	// The exam is not mine
-	     !Gbl.Test.AllowTeachers)						// I am not allowed to see this exam
-	    Lay_ShowErrorAndExit ("You can not view this test exam.");
+      case ActSeeOneTstResOth:
+	 if (Gbl.Usrs.Other.UsrDat.UsrCod != Gbl.Usrs.Me.UsrDat.UsrCod &&	// The test is not mine
+	     !Gbl.Test.AllowTeachers)						// I am not allowed to view this test result
+	    Lay_ShowErrorAndExit ("You can not view this test result.");
 	 break;
       default:	// Not applicable here
 	 return;
      }
 
-   /***** Get questions and user's answers of the test exam from database *****/
-   Tst_GetExamQuestionsFromDB (TstCod);
+   /***** Get questions and user's answers of the test result from database *****/
+   Tst_GetTestResultQuestionsFromDB (TstCod);
 
    /***** Start frame *****/
    Lay_StartRoundFrame (NULL,Txt_Test_result,NULL,Hlp_ASSESSMENT_Tests);
@@ -7525,7 +7527,7 @@ void Tst_ShowOneExam (void)
    fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL CELLS_PAD_10\">");
 
    /***** Header row *****/
-   /* Get data of the user who made the exam */
+   /* Get data of the user who made the test */
    if (!Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat))
       Lay_ShowErrorAndExit ("User does not exists.");
 
@@ -7553,14 +7555,14 @@ void Tst_ShowOneExam (void)
    fprintf (Gbl.F.Out,"</td>"
 	              "</tr>");
 
-   /* Exam date */
+   /* Test date */
    fprintf (Gbl.F.Out,"<tr>"
 	              "<td class=\"DAT_N RIGHT_TOP\">"
                       "%s:"
                       "</td>"
-	              "<td id=\"exam\" class=\"DAT LEFT_TOP\">"
+	              "<td id=\"test\" class=\"DAT LEFT_TOP\">"
 		      "<script type=\"text/javascript\">"
-		      "writeLocalDateHMSFromUTC('exam',%ld,'&nbsp;','%s');"
+		      "writeLocalDateHMSFromUTC('test',%ld,'&nbsp;','%s');"
 		      "</script>"
                       "</td>"
 	              "</tr>",
@@ -7596,19 +7598,19 @@ void Tst_ShowOneExam (void)
 	              "</tr>",
 	    Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX);
 
-   /* Tags present in this exam */
+   /* Tags present in this test */
    fprintf (Gbl.F.Out,"<tr>"
 	              "<td class=\"DAT_N RIGHT_TOP\">"
                       "%s:"
                       "</td>"
 	              "<td class=\"DAT LEFT_TOP\">",
             Txt_Tags);
-   Tst_ShowTstTagsPresentInAnExam (TstCod);
+   Tst_ShowTstTagsPresentInATestResult (TstCod);
    fprintf (Gbl.F.Out,"</td>"
 	              "</tr>");
 
    /***** Write answers and solutions *****/
-   Tst_ShowExamTstResult (TstTimeUTC);
+   Tst_ShowTestResult (TstTimeUTC);
 
    /***** Write total mark of test *****/
    if (ICanViewScore)
@@ -7622,10 +7624,10 @@ void Tst_ShowOneExam (void)
   }
 
 /*****************************************************************************/
-/********************* Show the result of a test exam ************************/
+/************************* Show the result of a test *************************/
 /*****************************************************************************/
 
-static void Tst_ShowExamTstResult (time_t TstTimeUTC)
+static void Tst_ShowTestResult (time_t TstTimeUTC)
   {
    extern const char *Txt_Question_modified;
    extern const char *Txt_Question_removed;
@@ -7663,7 +7665,8 @@ static void Tst_ShowExamTstResult (time_t TstTimeUTC)
 	 row[10] NumHitsNotBlank
 	 row[11] Score
 	 */
-	 /***** If this question has been edited later than test exam time ==> don't show question ****/
+	 /***** If this question has been edited later than test time
+	        ==> don't show question ****/
 	 EditTimeUTC = Dat_GetUNIXTimeFromStr (row[1]);
 	 ThisQuestionHasBeenEdited = false;
 	 // if (TstTimeUTC)
@@ -7689,7 +7692,7 @@ static void Tst_ShowExamTstResult (time_t TstTimeUTC)
 	       Lay_ShowErrorAndExit ("Wrong code of question.");
 
 	    /***** Write questions and answers *****/
-	    Tst_WriteQstAndAnsExam (NumQst,QstCod,row,
+	    Tst_WriteQstAndAnsTest (NumQst,QstCod,row,
 				    &ScoreThisQst,	// Not used here
 				    &AnswerIsNotBlank);	// Not used here
 	   }
@@ -7713,11 +7716,11 @@ static void Tst_ShowExamTstResult (time_t TstTimeUTC)
   }
 
 /*****************************************************************************/
-/************ Get data of a test exam using its test exam code ***************/
+/********* Get data of a test result using its test result code **************/
 /*****************************************************************************/
 
-static void Tst_GetExamDataByTstCod (long TstCod,time_t *TstTimeUTC,
-                                     unsigned *NumQsts,unsigned *NumQstsNotBlank,double *Score)
+static void Tst_GetTestResultDataByTstCod (long TstCod,time_t *TstTimeUTC,
+                                           unsigned *NumQsts,unsigned *NumQstsNotBlank,double *Score)
   {
    char Query[512];
    MYSQL_RES *mysql_res;
@@ -7731,14 +7734,14 @@ static void Tst_GetExamDataByTstCod (long TstCod,time_t *TstTimeUTC,
                   " WHERE TstCod='%ld' AND CrsCod='%ld'",
             TstCod,
             Gbl.CurrentCrs.Crs.CrsCod);
-   if (DB_QuerySELECT (Query,&mysql_res,"can not get data of a test exam of a user") == 1)
+   if (DB_QuerySELECT (Query,&mysql_res,"can not get data of a test result of a user") == 1)
      {
       row = mysql_fetch_row (mysql_res);
 
       /* Get user code (row[0]) */
       Gbl.Usrs.Other.UsrDat.UsrCod = Str_ConvertStrCodToLongCod (row[0]);
 
-      /* Get if teachers are allowed to see this test exam (row[1]) */
+      /* Get if teachers are allowed to see this test result (row[1]) */
       Gbl.Test.AllowTeachers = (row[1][0] == 'Y');
 
       /* Get date-time (row[2] holds UTC date-time) */
@@ -7764,10 +7767,10 @@ static void Tst_GetExamDataByTstCod (long TstCod,time_t *TstTimeUTC,
   }
 
 /*****************************************************************************/
-/************** Store user's answers of an exam into database ****************/
+/************ Store user's answers of an test result into database ***********/
 /*****************************************************************************/
 
-static void Tst_StoreOneExamQstInDB (long TstCod,long QstCod,unsigned NumQst,double Score)
+static void Tst_StoreOneTestResultQstInDB (long TstCod,long QstCod,unsigned NumQst,double Score)
   {
    char Query[256+Tst_MAX_SIZE_INDEXES_ONE_QST+Tst_MAX_SIZE_ANSWERS_ONE_QST];
    char Indexes[Tst_MAX_SIZE_INDEXES_ONE_QST+1];
@@ -7789,26 +7792,26 @@ static void Tst_StoreOneExamQstInDB (long TstCod,long QstCod,unsigned NumQst,dou
 	    Indexes,
 	    Answers);
    Str_SetDecimalPointToLocal ();	// Return to local system
-   DB_QueryINSERT (Query,"can not insert a question of an exam");
+   DB_QueryINSERT (Query,"can not insert a question of a test result");
   }
 
 /*****************************************************************************/
-/************* Get the questions of a test exam from database ****************/
+/************ Get the questions of a test result from database ***************/
 /*****************************************************************************/
 
-static void Tst_GetExamQuestionsFromDB (long TstCod)
+static void Tst_GetTestResultQuestionsFromDB (long TstCod)
   {
    char Query[512];
    MYSQL_RES *mysql_res;
    MYSQL_ROW row;
    unsigned NumQst;
 
-   /***** Get questions of a test exam from database *****/
+   /***** Get questions of a test result from database *****/
    sprintf (Query,"SELECT QstCod,Indexes,Answers"
 	          " FROM tst_exam_questions"
                   " WHERE TstCod='%ld' ORDER BY QstInd",
             TstCod);
-   Gbl.Test.NumQsts = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get questions of a test exam");
+   Gbl.Test.NumQsts = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get questions of a test result");
 
    /***** Get questions codes *****/
    for (NumQst = 0;
@@ -7840,70 +7843,70 @@ static void Tst_GetExamQuestionsFromDB (long TstCod)
   }
 
 /*****************************************************************************/
-/********************** Remove test exams made by a user *********************/
+/********************** Remove test results made by a user ********************/
 /*****************************************************************************/
 
-void Tst_RemoveExamsMadeByUsrInAllCrss (long UsrCod)
+void Tst_RemoveTestResultsMadeByUsrInAllCrss (long UsrCod)
   {
    char Query[512];
 
-   /***** Remove exams made by the specified user *****/
+   /***** Remove test results made by the specified user *****/
    sprintf (Query,"DELETE FROM tst_exam_questions"
 	          " USING tst_exams,tst_exam_questions"
                   " WHERE tst_exams.UsrCod='%ld'"
                   " AND tst_exams.TstCod=tst_exam_questions.TstCod",
             UsrCod);
-   DB_QueryDELETE (Query,"can not remove exams made by a user");
+   DB_QueryDELETE (Query,"can not remove test results made by a user");
 
    sprintf (Query,"DELETE FROM tst_exams"
 	          " WHERE UsrCod='%ld'",
 	    UsrCod);
-   DB_QueryDELETE (Query,"can not remove exams made by a user");
+   DB_QueryDELETE (Query,"can not remove test results made by a user");
   }
 
 /*****************************************************************************/
-/*************** Remove test exams made by a user in a course ****************/
+/************** Remove test results made by a user in a course ***************/
 /*****************************************************************************/
 
-void Tst_RemoveExamsMadeByUsrInCrs (long UsrCod,long CrsCod)
+void Tst_RemoveTestResultsMadeByUsrInCrs (long UsrCod,long CrsCod)
   {
    char Query[512];
 
-   /***** Remove exams made by the specified user *****/
+   /***** Remove test results made by the specified user *****/
    sprintf (Query,"DELETE FROM tst_exam_questions"
 	          " USING tst_exams,tst_exam_questions"
                   " WHERE tst_exams.CrsCod='%ld' AND tst_exams.UsrCod='%ld'"
                   " AND tst_exams.TstCod=tst_exam_questions.TstCod",
             CrsCod,UsrCod);
-   DB_QueryDELETE (Query,"can not remove exams made by a user in a course");
+   DB_QueryDELETE (Query,"can not remove test results made by a user in a course");
 
    sprintf (Query,"DELETE FROM tst_exams"
 	          " WHERE CrsCod='%ld' AND UsrCod='%ld'",
 	    CrsCod,UsrCod);
-   DB_QueryDELETE (Query,"can not remove exams made by a user in a course");
+   DB_QueryDELETE (Query,"can not remove test results made by a user in a course");
   }
 
 /*****************************************************************************/
-/******************* Remove all test exams made in a course ******************/
+/****************** Remove all test results made in a course *****************/
 /*****************************************************************************/
 
-void Tst_RemoveCrsExams (long CrsCod)
+void Tst_RemoveCrsTestResults (long CrsCod)
   {
    char Query[512];
 
-   /***** Remove questions of exams made in the course *****/
+   /***** Remove questions of test results made in the course *****/
    sprintf (Query,"DELETE FROM tst_exam_questions"
 	          " USING tst_exams,tst_exam_questions"
                   " WHERE tst_exams.CrsCod='%ld'"
                   " AND tst_exams.TstCod=tst_exam_questions.TstCod",
             CrsCod);
-   DB_QueryDELETE (Query,"can not remove exams made in a course");
+   DB_QueryDELETE (Query,"can not remove test results made in a course");
 
-   /***** Remove exams made in the course *****/
+   /***** Remove test results made in the course *****/
    sprintf (Query,"DELETE FROM tst_exams"
 	          " WHERE CrsCod='%ld'",
 	    CrsCod);
-   DB_QueryDELETE (Query,"can not remove exams made in a course");
+   DB_QueryDELETE (Query,"can not remove test results made in a course");
   }
 
 /*****************************************************************************/
diff --git a/swad_test.h b/swad_test.h
index fdc22f2b..918ea405 100644
--- a/swad_test.h
+++ b/swad_test.h
@@ -31,9 +31,9 @@
 /***************************** Public constants ******************************/
 /*****************************************************************************/
 
-#define Tst_SCORE_MAX				 10	// Maximum score of a test (10 in Spain). Must be unsigned!
+#define Tst_SCORE_MAX				 10	// Maximum score of a test (10 in Spain). Must be unsigned! // TODO: Make this configurable by teachers
 
-#define Tst_MAX_QUESTIONS_PER_EXAM		100	// Absolute maximum number of questions in a test exam
+#define Tst_MAX_QUESTIONS_PER_TEST		100	// Absolute maximum number of questions in a test
 #define Tst_MAX_TAGS_PER_QUESTION		  5
 #define Tst_MAX_TAG_LENGTH			255
 #define Tst_MAX_BYTES_TAG			(Tst_MAX_TAG_LENGTH*Str_MAX_CHARACTER)
@@ -122,8 +122,8 @@ struct Tst_Stats
 /*****************************************************************************/
 
 void Tst_ShowFormAskTst (void);
-void Tst_ShowNewTestExam (void);
-void Tst_AssessTestExam (void);
+void Tst_ShowNewTest (void);
+void Tst_AssessTest (void);
 void Tst_WriteQstStem (const char *Stem,const char *ClassStem);
 void Tst_WriteQstFeedback (const char *Feedback,const char *ClassFeedback);
 
@@ -163,14 +163,14 @@ void Tst_FreeTagsList (void);
 
 void Tst_GetTestStats (Tst_AnswerType_t AnsType,struct Tst_Stats *Stats);
 
-void Tst_SelUsrsToSeeUsrsExams (void);
-void Tst_SelDatesToSeeMyExams (void);
-void Tst_ShowUsrsExams (void);
-void Tst_ShowMyExams (void);
-void Tst_ShowOneExam (void);
-void Tst_RemoveExamsMadeByUsrInAllCrss (long UsrCod);
-void Tst_RemoveExamsMadeByUsrInCrs (long UsrCod,long CrsCod);
-void Tst_RemoveCrsExams (long CrsCod);
+void Tst_SelUsrsToSeeUsrsTestResults (void);
+void Tst_SelDatesToSeeMyTestResults (void);
+void Tst_ShowUsrsTestResults (void);
+void Tst_ShowMyTestResults (void);
+void Tst_ShowOneTestResult (void);
+void Tst_RemoveTestResultsMadeByUsrInAllCrss (long UsrCod);
+void Tst_RemoveTestResultsMadeByUsrInCrs (long UsrCod,long CrsCod);
+void Tst_RemoveCrsTestResults (long CrsCod);
 
 void Tst_RemoveCrsTests (long CrsCod);
 
diff --git a/swad_text.c b/swad_text.c
index c5a35240..c1b288c8 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -2279,25 +2279,25 @@ const char *Txt_All_types_of_answers =		// Answers of a test
 	"Todos os tipos de respostas";
 #endif
 
-const char *Txt_Allow_teachers_to_consult_this_exam =
+const char *Txt_Allow_teachers_to_consult_this_test =
 #if   L==1
-	"Permetre als professors consultar aquest examen";
+	"Permetre als professors consultar aquest test";
 #elif L==2
-	"Erm&ouml;glichen es den Lehrern, diese Pr&uuml;fung zu konsultieren";
+	"Erm&ouml;glichen es den Lehrern, diese Test zu konsultieren";
 #elif L==3
-	"Allow teachers to consult this exam";
+	"Allow teachers to consult this test";
 #elif L==4
-	"Permitir a los profesores consultar este examen";
+	"Permitir a los profesores consultar este test";
 #elif L==5
-	"Permitir a los profesores consultar este examen";
+	"Permettre aux enseignants de consulter ce test";
 #elif L==6
-	"Permitir a los profesores consultar este examen";
+	"Permitir a los profesores consultar este test";	// Okoteve traducción
 #elif L==7
-	"Lasciare gli insegnanti di consultare questo esame";
+	"Lasciare gli insegnanti di consultare questo test";
 #elif L==8
-	"Pozwalaj&aogon; nauczycielom skonsultowa&cacute; ten egzamin";
+	"Pozwalaj&aogon; nauczycielom skonsultowa&cacute; ten test";
 #elif L==9
-	"Permitir que os professores de consultar este exame";
+	"Permitir que os professores de consultar este teste";
 #endif
 
 const char *Txt_Alphabetic_BR_code_BR_ISO_3166_1 =
@@ -9568,25 +9568,25 @@ const char *Txt_Done =
 	"Feito";
 #endif
 
-const char *Txt_Done_assess_exam =
+const char *Txt_Done_assess_test =
 #if   L==1
-	"He acabat; corregir examen";
+	"He acabat; corregir test";
 #elif L==2
-	"Geschehen; beurteilen Pr&uuml;fung";
+	"Geschehen; beurteilen Test";
 #elif L==3
-	"Done; assess exam";
+	"Done; assess test";
 #elif L==4
-	"He terminado; corregir examen";
+	"He terminado; corregir test";
 #elif L==5
-	"Fait; corriger l'examen";
+	"Fait; corriger test";
 #elif L==6
-	"He terminado; corregir examen";	// Okoteve traducción
+	"He terminado; corregir test";	// Okoteve traducción
 #elif L==7
-	"Finito; correggere l'esame";
+	"Finito; correggere test";
 #elif L==8
-	"Sporz&aogon;dzono; oceny egzaminu";
+	"Sporz&aogon;dzono; oceny test";
 #elif L==9
-	"Feito; corrigir exame";
+	"Feito; corrigir teste";
 #endif
 
 const char *Txt_Download =	// As a verb
@@ -10986,27 +10986,6 @@ const char *Txt_Exam =
 	"Exame";
 #endif
 
-const char *Txt_exam =
-#if   L==1
-	"ex&agrave;men";
-#elif L==2
-	"Pr&uuml;fung";
-#elif L==3
-	"exam";
-#elif L==4
-	"examen";
-#elif L==5
-	"examen";
-#elif L==6
-	"kuaara'&atilde;";
-#elif L==7
-	"esame";
-#elif L==8
-	"egzamin";
-#elif L==9
-	"exame";
-#endif
-
 const char *Txt_EXAM_ANNOUNCEMENT =
 #if   L==1
 	"CONVOCAT&Ograve;RIA D'EXAMEN";
@@ -11322,48 +11301,6 @@ const char *Txt_Exam_of_X =	// Warning: it is very important to include %s in th
 	"Exam of %s";		// Necessita de tradução
 #endif
 
-const char *Txt_Exams =
-#if   L==1
-	"Ex&agrave;mens";
-#elif L==2
-	"Pr&uuml;fungen";
-#elif L==3
-	"Exams";
-#elif L==4
-	"Ex&aacute;menes";
-#elif L==5
-	"Examens";
-#elif L==6
-	"Ex&aacute;menes";	// Okoteve traducción
-#elif L==7
-	"Esami";
-#elif L==8
-	"Egzaminy";
-#elif L==9
-	"Exames";
-#endif
-
-const char *Txt_exams =
-#if   L==1
-	"ex&agrave;mens";
-#elif L==2
-	"Pr&uuml;fungen";
-#elif L==3
-	"exams";
-#elif L==4
-	"ex&aacute;menes";
-#elif L==5
-	"examens";
-#elif L==6
-	"ex&aacute;menes";	// Okoteve traducción
-#elif L==7
-	"esami";
-#elif L==8
-	"egzaminy";
-#elif L==9
-	"exames";
-#endif
-
 const char *Txt_Existing_question =
 #if   L==1
 	"Pregunta ja existent";
@@ -13489,27 +13426,6 @@ const char *Txt_general_topics =
 	"temas gerais";
 #endif
 
-const char *Txt_Generate_exam =
-#if   L==1
-	"Generar examen";
-#elif L==2
-	"Generieren Pr&uuml;fung";
-#elif L==3
-	"Generate exam";
-#elif L==4
-	"Generar examen";
-#elif L==5
-	"G&eacute;n&eacute;rer l'examen";
-#elif L==6
-	"Generar examen";	// Okoteve traducción
-#elif L==7
-	"Crea esame";
-#elif L==8
-	"Wygeneruj egzamin";
-#elif L==9
-	"Gerar teste";
-#endif
-
 const char *Txt_Generate_report =
 #if   L==1
 	"Generar informe";
@@ -13531,6 +13447,27 @@ const char *Txt_Generate_report =
 	"Gerar relat&oacute;rio";
 #endif
 
+const char *Txt_Generate_test =
+#if   L==1
+	"Generar test";
+#elif L==2
+	"Generieren Test";
+#elif L==3
+	"Generate test";
+#elif L==4
+	"Generar test";
+#elif L==5
+	"G&eacute;n&eacute;rer test";
+#elif L==6
+	"Generar test";	// Okoteve traducción
+#elif L==7
+	"Crea test";
+#elif L==8
+	"Wygeneruj test";
+#elif L==9
+	"Gerar teste";
+#endif
+
 const char *Txt_Get_a_new_password =
 #if   L==1
 	"Rebre una nova contrasenya";
@@ -31406,27 +31343,6 @@ const char *Txt_results_per_page =
 	"resultados por p&aacute;gina";
 #endif
 
-const char *Txt_Results_tests =
-#if   L==1
-	"Resultats tests";
-#elif L==2
-	"Ergebnisse Tests";
-#elif L==3
-	"Results tests";
-#elif L==4
-	"Resultados tests";
-#elif L==5
-	"R&eacute;sultats tests";
-#elif L==6
-	"Resultados tests";			// Okoteve traducción
-#elif L==7
-	"Risultati test";
-#elif L==8
-	"Wyniki test&oacute;w";
-#elif L==9
-	"Resultados testes";
-#endif
-
 const char *Txt_Retype_new_password =
 #if   L==1
 	"Reescriviu la nova contrasenya";
@@ -35361,27 +35277,6 @@ const char *Txt_Search_courses =
 	"Procurar disciplinas";
 #endif
 
-const char *Txt_See_exam =
-#if   L==1
-	"Veure ex&agrave;men";
-#elif L==2
-	"Siehe Pr&uuml;fung";
-#elif L==3
-	"See exam";
-#elif L==4
-	"Ver examen";
-#elif L==5
-	"Voir examen";
-#elif L==6
-	"Ver examen";	// Okoteve traducción
-#elif L==7
-	"Vedi esame";
-#elif L==8
-	"Wiadomo&sacute;ci egzamin";
-#elif L==9
-	"Veja exame";
-#endif
-
 const char *Txt_See_full_notice =
 #if   L==1
 	"Veure avís complet";
@@ -41216,7 +41111,7 @@ const char *Txt_Test_No_X_that_you_make_in_this_course =	// Warning: it is very
 
 const char *Txt_Test_result =
 #if   L==1
-	"Resultado del test";	// Necessita traduccio
+	"Resultat del test";
 #elif L==2
 	"Testergebnis";
 #elif L==3
@@ -41230,11 +41125,32 @@ const char *Txt_Test_result =
 #elif L==7
 	"Risultato del test";
 #elif L==8
-	"Test result";		// Potrzebujesz tlumaczenie
+	"Wynik testu";
 #elif L==9
 	"Resultado do teste";
 #endif
 
+const char *Txt_Test_results =
+#if   L==1
+	"Resultats de tests";
+#elif L==2
+	"Testergebnisse";
+#elif L==3
+	"Test results";
+#elif L==4
+	"Resultados de tests";
+#elif L==5
+	"R&eacute;sultats des tests";
+#elif L==6
+	"Resultados de tests";	// Okoteve traducción
+#elif L==7
+	"Risultati dei test";
+#elif L==8
+	"Wyniki test&oacute;w";
+#elif L==9
+	"Resultados dos testes";
+#endif
+
 const char *Txt_Text =
 #if   L==1
 	"Text";
@@ -50096,27 +50012,6 @@ const char *Txt_View_event =
 	"Ver evento";
 #endif
 
-const char *Txt_View_exams =
-#if   L==1
-	"Veure ex&agrave;mens";
-#elif L==2
-	"Siehe Pr&uuml;fungen";
-#elif L==3
-	"View exams";
-#elif L==4
-	"Ver ex&aacute;menes";
-#elif L==5
-	"Voir examens";
-#elif L==6
-	"Ver ex&aacute;menes";	// Okoteve traducción
-#elif L==7
-	"Vedi esami";
-#elif L==8
-	"Wiadomo&sacute;ci egzaminy";
-#elif L==9
-	"Veja exames";
-#endif
-
 const char *Txt_View_in_a_new_window =
 #if   L==1
 	"Mostrar en una finestra nova";
@@ -50222,6 +50117,48 @@ const char *Txt_View_survey_results =
 	"Ver resultados";
 #endif
 
+const char *Txt_View_test =
+#if   L==1
+	"Veure test";
+#elif L==2
+	"Siehe Test";
+#elif L==3
+	"View test";
+#elif L==4
+	"Ver test";
+#elif L==5
+	"Voir test";
+#elif L==6
+	"Ver test";	// Okoteve traducción
+#elif L==7
+	"Vedi test";
+#elif L==8
+	"Wiadomo&sacute;ci test";
+#elif L==9
+	"Veja teste";
+#endif
+
+const char *Txt_View_test_results =
+#if   L==1
+	"Veure resultats de tests";
+#elif L==2
+	"Siehe Testergebnisse";
+#elif L==3
+	"View test results";
+#elif L==4
+	"Ver resultados de tests";
+#elif L==5
+	"Voir r&eacute;sultats de tests";
+#elif L==6
+	"Ver resultados de tests";	// Okoteve traducción
+#elif L==7
+	"Vedi risultati dei test";
+#elif L==8
+	"Zobacz wyniki test&oacute;w";
+#elif L==9
+	"Ver resultados de testes";
+#endif
+
 const char *Txt_View_works =
 #if   L==1
 	"Veure treballs";
@@ -50306,25 +50243,25 @@ const char *Txt_Visible_MALE_PLURAL =
 	"Vis&iacute;veis";
 #endif
 
-const char *Txt_Visible_exams =
+const char *Txt_Visible_tests =
 #if   L==1
-	"Ex&agrave;mens visibles";
+	"Tests visibles";
 #elif L==2
-	"Visible Pr%uuml;fungen";
+	"Sichtbare Pr%uuml;fungen";
 #elif L==3
-	"Visible exams";
+	"Visible tests";
 #elif L==4
-	"Ex&aacute;menes visibles";
+	"Tests visibles";
 #elif L==5
-	"Examens visibles";
+	"Tests visibles";
 #elif L==6
-	"Ex&aacute;menes visibles";	// Okoteve traducción
+	"Tests visibles";	// Okoteve traducción
 #elif L==7
-	"Esami visibili";
+	"Test visibili";
 #elif L==8
-	"Widoczne egzaminy";
+	"Widoczne testy";
 #elif L==9
-	"Exames vis&iacute;veis";
+	"Testes vis&iacute;veis";
 #endif
 
 const char *Txt_Visible_survey =