diff --git a/examples/C/bufr_attributes.c b/examples/C/bufr_attributes.c
index 1fad88652..58f5a9de2 100644
--- a/examples/C/bufr_attributes.c
+++ b/examples/C/bufr_attributes.c
@@ -40,7 +40,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    /* loop over the messages in the bufr file */
+    /* loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
diff --git a/examples/C/bufr_expanded.c b/examples/C/bufr_expanded.c
index 46ee17b0a..838dd70a6 100644
--- a/examples/C/bufr_expanded.c
+++ b/examples/C/bufr_expanded.c
@@ -40,14 +40,14 @@ int main(int argc, char* argv[])
 
     filename = argv[1];
 
-    /* open bufr file */
+    /* open BUFR file */
     in = fopen(filename, "rb");
     if (!in) {
         fprintf(stderr, "Error: unable to open file %s\n", filename);
         return 1;
     }
 
-    /* loop over the messages in the bufr file */
+    /* loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
diff --git a/examples/C/bufr_get_keys.c b/examples/C/bufr_get_keys.c
index c475c8c6b..42b26ca70 100644
--- a/examples/C/bufr_get_keys.c
+++ b/examples/C/bufr_get_keys.c
@@ -40,7 +40,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    /* loop over the messages in the bufr file */
+    /* loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
diff --git a/examples/C/bufr_get_string_array.c b/examples/C/bufr_get_string_array.c
index 1220f04c7..43f499074 100644
--- a/examples/C/bufr_get_string_array.c
+++ b/examples/C/bufr_get_string_array.c
@@ -33,7 +33,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    /* loop over the messages in the bufr file */
+    /* loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
diff --git a/examples/C/bufr_missing.c b/examples/C/bufr_missing.c
index da968b11a..0c9fcc867 100644
--- a/examples/C/bufr_missing.c
+++ b/examples/C/bufr_missing.c
@@ -36,7 +36,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    /* loop over the messages in the bufr file */
+    /* loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
diff --git a/examples/C/bufr_read_header.c b/examples/C/bufr_read_header.c
index 125d521ca..8570cdb3b 100644
--- a/examples/C/bufr_read_header.c
+++ b/examples/C/bufr_read_header.c
@@ -43,7 +43,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    /* loop over the messages in the bufr file */
+    /* loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
@@ -53,8 +53,7 @@ int main(int argc, char* argv[])
 
         printf("message: %d\n", cnt);
 
-        /* get and print some keys form the BUFR header */
-
+        /* get and print some keys from the BUFR header */
         CODES_CHECK(codes_get_long(h, "dataCategory", &longVal), 0);
         printf("  dataCategory: %ld\n", longVal);
 
@@ -79,7 +78,7 @@ int main(int argc, char* argv[])
         CODES_CHECK(codes_get_long(h, "numberOfSubsets", &longVal), 0);
         printf("  numberOfSubsets: %ld\n", longVal);
 
-        /* delete handle */
+        /* release memory */
         codes_handle_delete(h);
 
         cnt++;
diff --git a/examples/C/bufr_read_scatterometer.c b/examples/C/bufr_read_scatterometer.c
index 244d8878f..0709dfc43 100644
--- a/examples/C/bufr_read_scatterometer.c
+++ b/examples/C/bufr_read_scatterometer.c
@@ -44,7 +44,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    /* Loop over the messages in the bufr file */
+    /* Loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
diff --git a/examples/C/bufr_read_synop.c b/examples/C/bufr_read_synop.c
index 8e0d8557a..fa013a7bb 100644
--- a/examples/C/bufr_read_synop.c
+++ b/examples/C/bufr_read_synop.c
@@ -42,7 +42,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    /* loop over the messages in the bufr file */
+    /* loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
diff --git a/examples/C/bufr_read_temp.c b/examples/C/bufr_read_temp.c
index 90772d772..d01ba4866 100644
--- a/examples/C/bufr_read_temp.c
+++ b/examples/C/bufr_read_temp.c
@@ -51,7 +51,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    /* Loop over the messages in the bufr file */
+    /* Loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
diff --git a/examples/C/bufr_set_keys.c b/examples/C/bufr_set_keys.c
index a3f383d4d..58c4da0ef 100644
--- a/examples/C/bufr_set_keys.c
+++ b/examples/C/bufr_set_keys.c
@@ -54,7 +54,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    /* loop over the messages in the bufr file */
+    /* loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
diff --git a/examples/C/bufr_subset.c b/examples/C/bufr_subset.c
index b9a0972c5..191dedc42 100644
--- a/examples/C/bufr_subset.c
+++ b/examples/C/bufr_subset.c
@@ -41,7 +41,7 @@ int main(int argc, char* argv[])
         return 1;
     }
 
-    /* loop over the messages in the bufr file */
+    /* loop over the messages in the BUFR file */
     while ((h = codes_handle_new_from_file(NULL, in, PRODUCT_BUFR, &err)) != NULL || err != CODES_SUCCESS) {
         if (h == NULL) {
             fprintf(stderr, "Error: unable to create handle for message %d\n", cnt);
diff --git a/examples/F90/bufr_attributes.f90 b/examples/F90/bufr_attributes.f90
index b56b03f2a..4a0075600 100644
--- a/examples/F90/bufr_attributes.f90
+++ b/examples/F90/bufr_attributes.f90
@@ -25,13 +25,13 @@ program bufr_attributes
 
    call codes_open_file(ifile, '../../data/bufr/syno_multi.bufr', 'r')
 
-! the first bufr message is loaded from file
-! ibufr is the bufr id to be used in subsequent calls
+! the first BUFR message is loaded from file
+! ibufr is the BUFR id to be used in subsequent calls
    call codes_bufr_new_from_file(ifile, ibufr, iret)
 
    do while (iret /= CODES_END_OF_FILE)
 
-      ! Get and print some keys form the BUFR header
+      ! Get and print some keys from the BUFR header
       write (*, *) 'message: ', count
 
       ! We need to instruct ecCodes to expand all the descriptors
@@ -96,10 +96,10 @@ program bufr_attributes
       call codes_get(ibufr, 'airTemperatureAt2M->percentConfidence->width', iVal); 
       write (*, *) '  airTemperatureAt2M->percentConfidence->width:', iVal
 
-      ! Release the bufr message
+      ! Release the BUFR message
       call codes_release(ibufr)
 
-      ! Load the next bufr message
+      ! Load the next BUFR message
       call codes_bufr_new_from_file(ifile, ibufr, iret)
 
       count = count + 1
diff --git a/examples/F90/bufr_get_keys.f90 b/examples/F90/bufr_get_keys.f90
index 9d4df930b..c6def444d 100644
--- a/examples/F90/bufr_get_keys.f90
+++ b/examples/F90/bufr_get_keys.f90
@@ -27,13 +27,13 @@ program bufr_get_keys
 
    call codes_open_file(ifile, '../../data/bufr/syno_multi.bufr', 'r')
 
-   ! The first bufr message is loaded from file,
-   ! ibufr is the bufr id to be used in subsequent calls
+   ! The first BUFR message is loaded from file,
+   ! ibufr is the BUFR id to be used in subsequent calls
    call codes_bufr_new_from_file(ifile, ibufr, iret)
 
    do while (iret /= CODES_END_OF_FILE)
 
-      ! Get and print some keys form the BUFR header
+      ! Get and print some keys from the BUFR header
       write (*, *) 'message: ', count
 
       ! We need to instruct ecCodes to expand all the descriptors
@@ -81,10 +81,10 @@ program bufr_get_keys
       deallocate (values)
       deallocate (descriptors)
 
-      ! Release the bufr message
+      ! Release the BUFR message
       call codes_release(ibufr)
 
-      ! Load the next bufr message
+      ! Load the next BUFR message
       call codes_bufr_new_from_file(ifile, ibufr, iret)
 
       count = count + 1
diff --git a/examples/F90/bufr_keys_iterator.f90 b/examples/F90/bufr_keys_iterator.f90
index c68a73e71..b3a5cbfd9 100644
--- a/examples/F90/bufr_keys_iterator.f90
+++ b/examples/F90/bufr_keys_iterator.f90
@@ -26,13 +26,13 @@ program bufr_keys_iterator
 
    call codes_open_file(ifile, '../../data/bufr/syno_1.bufr', 'r')
 
-   ! The first bufr message is loaded from file,
-   ! ibufr is the bufr id to be used in subsequent calls
+   ! The first BUFR message is loaded from file,
+   ! ibufr is the BUFR id to be used in subsequent calls
    call codes_bufr_new_from_file(ifile, ibufr, iret)
 
    do while (iret /= CODES_END_OF_FILE)
 
-      ! Get and print some keys form the BUFR header
+      ! Get and print some keys from the BUFR header
       write (*, *) 'message: ', count
 
       ! We need to instruct ecCodes to expand all the descriptors
@@ -62,10 +62,10 @@ program bufr_keys_iterator
       ! Delete key iterator
       call codes_bufr_keys_iterator_delete(kiter)
 
-      ! Release the bufr message
+      ! Release the BUFR message
       call codes_release(ibufr)
 
-      ! Load the next bufr message
+      ! Load the next BUFR message
       call codes_bufr_new_from_file(ifile, ibufr, iret)
 
       count = count + 1
diff --git a/examples/F90/bufr_read_header.f90 b/examples/F90/bufr_read_header.f90
index c6eb92421..a7acd60e3 100644
--- a/examples/F90/bufr_read_header.f90
+++ b/examples/F90/bufr_read_header.f90
@@ -26,13 +26,13 @@ program bufr_read_header
 
    call codes_open_file(ifile, '../../data/bufr/syno_multi.bufr', 'r')
 
-   ! The first bufr message is loaded from file,
-   ! ibufr is the bufr id to be used in subsequent calls
+   ! The first BUFR message is loaded from file,
+   ! ibufr is the BUFR id to be used in subsequent calls
    call codes_bufr_new_from_file(ifile, ibufr, iret)
 
    do while (iret /= CODES_END_OF_FILE)
 
-      ! Get and print some keys form the BUFR header
+      ! Get and print some keys from the BUFR header
       write (*, *) 'message: ', count
 
       call codes_get(ibufr, 'dataCategory', dataCategory); 
@@ -59,10 +59,10 @@ program bufr_read_header
       call codes_get(ibufr, 'numberOfSubsets', numberOfSubsets)
       write (*, *) '  numberOfSubsets:', numberOfSubsets
 
-      ! Release the bufr message
+      ! Release the BUFR message
       call codes_release(ibufr)
 
-      ! Load the next bufr message
+      ! Load the next BUFR message
       call codes_bufr_new_from_file(ifile, ibufr, iret)
 
       count = count + 1
diff --git a/examples/F90/bufr_subset.f90 b/examples/F90/bufr_subset.f90
index 591ffb493..1e559775d 100644
--- a/examples/F90/bufr_subset.f90
+++ b/examples/F90/bufr_subset.f90
@@ -26,13 +26,13 @@ program bufr_subset
 
    call codes_open_file(ifile, '../../data/bufr/synop_multi_subset.bufr', 'r')
 
-   ! The first bufr message is loaded from file,
-   ! ibufr is the bufr id to be used in subsequent calls
+   ! The first BUFR message is loaded from file,
+   ! ibufr is the BUFR id to be used in subsequent calls
    call codes_bufr_new_from_file(ifile, ibufr, iret)
 
    do while (iret /= CODES_END_OF_FILE)
 
-      ! Get and print some keys form the BUFR header
+      ! Get and print some keys from the BUFR header
       write (*, *) 'message: ', count
 
       ! We need to instruct ecCodes to expand all the descriptors
@@ -61,10 +61,10 @@ program bufr_subset
 
       end do
 
-      ! Release the bufr message
+      ! Release the BUFR message
       call codes_release(ibufr)
 
-      ! Load the next bufr message
+      ! Load the next BUFR message
       call codes_bufr_new_from_file(ifile, ibufr, iret)
 
       count = count + 1