diff --git a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/BasePetstore.java b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/BasePetstore.java
index 1a5d256..40d337b 100644
--- a/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/BasePetstore.java
+++ b/st-tdg-test/src/test/java/test4giis/tdrules/tdg/st/test/petstore/BasePetstore.java
@@ -10,19 +10,19 @@
 /**
  * Common configuration and customization for all Swagger Petstore tests.
  * 
- * There are two different set of test clases:
+ * There are two different sets of test classes:
  * 
  * - Classes containing Petstore0 in the name: It is an initial 
- *   proof of concept of of TDG using simplified entities (Pet0, Pet1...)
+ *   proof of concept of TDG using simplified entities (Pet0, Pet1...)
  *   from the Swagger Petstore.
  * - Classes containing Petstore in the name: They use the real
- *   entities in the petstore OpenApi model.
+ *   entities in the Petstore OpenApi model.
  *   
- * The former tests (Petstore0) also serve to illustrate using examples the main 
+ * The former tests (Petstore0) also serve to illustrate by means of examples the main 
  * transformations performed on the model and the coverage rules.
  * 
- * Documentation is more exhaustive in TestPetstore0DatagenLocal and TestPetstore0DatagenLocal
- * The others are the different flavour variants to include data generation and a live SUT
+ * Documentation is more exhaustive in TestPetstore0DatagenLocal and TestPetstoreDatagenLocal.
+ * The others are the different variants to include data generation and a live SUT.
  */
 public class BasePetstore  extends BaseAll{
 	protected static final String PETSTORE_SCHEMA_LOCAL = "../sut-petstore/src/main/resources/openapi.yaml";
@@ -51,10 +51,10 @@ protected String getDeleteAllDataLiveEndpoint() {
 
 	@Override
 	protected TdSchema getSchema() {
-		// Configures the schema id resolver to use id attribute as uid, but there are exceptions:
-		// - Tag has an id, but looking at the source code, a post inserts unconditionally,
+		// Configures the schema idResolver to use id attribute as uid, but there are exceptions:
+		// - Tag has an id, but looking at the source code, a post endpoint inserts unconditionally,
 		//   allowing repeated id values. Considers this id as no uid
-		// - Order0 has been created for some tests, it does not follow strictely
+		// - Order0 has been created for some tests. It does not strictly follow
 		//   the conventions (attribute petId references Pet0.id)
 		OaSchemaApi api = new OaSchemaApi(PETSTORE_SCHEMA_LOCAL)
 				.setIdResolver(new OaSchemaIdResolver().setIdName("id")
@@ -63,7 +63,7 @@ protected TdSchema getSchema() {
 	}
 
 	/**
-	 * Dictionary to load more user friendly petstore data, includes values enumertions for strings and masks
+	 * Dictionary to load more user friendly Petstore data. It includes values enumerations for strings and masks
 	 */
 	protected IAttrGen getDictionaryAttrGen() {
 		return new DictionaryAttrGen()