diff --git a/aws/README.md b/aws/README.md
index 2c61928095..d14ea8a75e 100644
--- a/aws/README.md
+++ b/aws/README.md
@@ -4,7 +4,6 @@
 - [AWS S3 with Java](http://www.baeldung.com/aws-s3-java)
 - [AWS Lambda With Java](http://www.baeldung.com/java-aws-lambda)
 - [Managing EC2 Instances in Java](http://www.baeldung.com/ec2-java)
-- [http://www.baeldung.com/aws-s3-multipart-upload](https://github.com/eugenp/tutorials/tree/master/aws)
 - [Multipart Uploads in Amazon S3 with Java](http://www.baeldung.com/aws-s3-multipart-upload)
 - [Integration Testing with a Local DynamoDB Instance](http://www.baeldung.com/dynamodb-local-integration-tests)
 - [Using the JetS3t Java Client With Amazon S3](http://www.baeldung.com/jets3t-amazon-s3)
diff --git a/core-java-8/README.md b/core-java-8/README.md
index eca07883e0..99182da390 100644
--- a/core-java-8/README.md
+++ b/core-java-8/README.md
@@ -4,9 +4,9 @@
 
 ### Relevant Articles: 
 - [Java 8 Collectors](http://www.baeldung.com/java-8-collectors)
-- [Guide to Java 8’s Functional Interfaces](http://www.baeldung.com/java-8-functional-interfaces)
+- [Functional Interfaces in Java 8](http://www.baeldung.com/java-8-functional-interfaces)
 - [Java 8 – Powerful Comparison with Lambdas](http://www.baeldung.com/java-8-sort-lambda)
-- [Java 8 New Features](http://www.baeldung.com/java-8-new-features)
+- [New Features in Java 8](http://www.baeldung.com/java-8-new-features)
 - [Lambda Expressions and Functional Interfaces: Tips and Best Practices](http://www.baeldung.com/java-8-lambda-expressions-tips)
 - [The Double Colon Operator in Java 8](http://www.baeldung.com/java-8-double-colon-operator)
 - [Guide to Java 8 groupingBy Collector](http://www.baeldung.com/java-groupingby-collector)
diff --git a/core-java-9/README.md b/core-java-9/README.md
index 7e256d5c7e..224306db19 100644
--- a/core-java-9/README.md
+++ b/core-java-9/README.md
@@ -16,7 +16,7 @@
 - [Java 9 Reactive Streams](http://www.baeldung.com/java-9-reactive-streams)
 - [Java 9 java.util.Objects Additions](http://www.baeldung.com/java-9-objects-new)
 - [Java 9 Variable Handles Demistyfied](http://www.baeldung.com/java-variable-handles)
-- [Exploring the New HTTP Client in Java 9](http://www.baeldung.com/java-9-http-client)
+- [Exploring the New HTTP Client in Java 9 and 11](http://www.baeldung.com/java-9-http-client)
 - [Method Handles in Java](http://www.baeldung.com/java-method-handles)
 - [Introduction to Chronicle Queue](http://www.baeldung.com/java-chronicle-queue)
 - [A Guide to Java 9 Modularity](http://www.baeldung.com/java-9-modularity)
diff --git a/core-java-collections-list/README.md b/core-java-collections-list/README.md
index 598d8331d0..c5139074e9 100644
--- a/core-java-collections-list/README.md
+++ b/core-java-collections-list/README.md
@@ -5,7 +5,7 @@
 ### Relevant Articles: 
 - [Immutable ArrayList in Java](http://www.baeldung.com/java-immutable-list)
 - [Guide to the Java ArrayList](http://www.baeldung.com/java-arraylist)
-- [Random List Element](http://www.baeldung.com/java-random-list-element)
+- [Java – Get Random Item/Element From a List](http://www.baeldung.com/java-random-list-element)
 - [Removing all nulls from a List in Java](http://www.baeldung.com/java-remove-nulls-from-list)
 - [Removing all duplicates from a List in Java](http://www.baeldung.com/java-remove-duplicates-from-list)
 - [How to TDD a List Implementation in Java](http://www.baeldung.com/java-test-driven-list)
diff --git a/core-java-io/README.md b/core-java-io/README.md
index 9a25009849..5e0f7bfbd1 100644
--- a/core-java-io/README.md
+++ b/core-java-io/README.md
@@ -3,7 +3,7 @@
 ## Core Java IO Cookbooks and Examples
 
 ### Relevant Articles: 
-- [Java - Reading a Large File Efficiently](http://www.baeldung.com/java-read-lines-large-file)
+- [How to Read a Large File Efficiently with Java](http://www.baeldung.com/java-read-lines-large-file)
 - [Java InputStream to String](http://www.baeldung.com/convert-input-stream-to-string)
 - [Java – Write to File](http://www.baeldung.com/java-write-to-file)
 - [Java - Convert File to InputStream](http://www.baeldung.com/convert-file-to-input-stream)
@@ -11,7 +11,7 @@
 - [Java – Byte Array to Writer](http://www.baeldung.com/java-convert-byte-array-to-writer)
 - [Java – Directory Size](http://www.baeldung.com/java-folder-size)
 - [Differences Between the Java WatchService API and the Apache Commons IO Monitor Library](http://www.baeldung.com/java-watchservice-vs-apache-commons-io-monitor-library)
-- [Calculate the Size of a File in Java](http://www.baeldung.com/java-file-size)
+- [File Size in Java](http://www.baeldung.com/java-file-size)
 - [Comparing getPath(), getAbsolutePath(), and getCanonicalPath() in Java](http://www.baeldung.com/java-path)
 - [Using Java MappedByteBuffer](http://www.baeldung.com/java-mapped-byte-buffer)
 - [Copy a File with Java](http://www.baeldung.com/java-copy-file)
diff --git a/core-java-lang-syntax/README.md b/core-java-lang-syntax/README.md
index 99c8613929..81c3d6c354 100644
--- a/core-java-lang-syntax/README.md
+++ b/core-java-lang-syntax/README.md
@@ -3,12 +3,12 @@
 ## Core Java Lang Syntax Cookbooks and Examples
 
 ### Relevant Articles: 
-- [Introduction to Java Generics](http://www.baeldung.com/java-generics)
+- [The Basics of Java Generics](http://www.baeldung.com/java-generics)
 - [Java Primitive Conversions](http://www.baeldung.com/java-primitive-conversions)
 - [Java Double Brace Initialization](http://www.baeldung.com/java-double-brace-initialization)
 - [Guide to the Diamond Operator in Java](http://www.baeldung.com/java-diamond-operator)
 - [The Java continue and break Keywords](http://www.baeldung.com/java-continue-and-break)
-- [A Guide to Java Initialization](http://www.baeldung.com/java-initialization)
+- [A Guide to Creating Objects in Java](http://www.baeldung.com/java-initialization)
 - [A Guide to Java Loops](http://www.baeldung.com/java-loops)
 - [Varargs in Java](http://www.baeldung.com/java-varargs)
 - [A Guide to Java Enums](http://www.baeldung.com/a-guide-to-java-enums)
diff --git a/core-java-networking/README.md b/core-java-networking/README.md
index 40be47fbcc..e76f28030d 100644
--- a/core-java-networking/README.md
+++ b/core-java-networking/README.md
@@ -12,6 +12,6 @@
 - [A Guide to the Java URL](http://www.baeldung.com/java-url)
 - [Working with Network Interfaces in Java](http://www.baeldung.com/java-network-interfaces)
 - [A Guide to Java Sockets](http://www.baeldung.com/a-guide-to-java-sockets)
-- [URL Encoding and Decoding in Java](http://www.baeldung.com/java-url-encoding-decoding)
-- [How to Perform a Simple HTTP Request in Java](http://www.baeldung.com/java-http-request)
-- [Difference between URL and URI](http://www.baeldung.com/java-url-vs-uri)
+- [Guide to Java URL Encoding/Decoding](http://www.baeldung.com/java-url-encoding-decoding)
+- [Do a Simple HTTP Request in Java](http://www.baeldung.com/java-http-request)
+- [Difference between URL and URI](http://www.baeldung.com/java-url-vs-uri)
\ No newline at end of file
diff --git a/core-java-security/README.md b/core-java-security/README.md
index d3343f79ca..9526b15be5 100644
--- a/core-java-security/README.md
+++ b/core-java-security/README.md
@@ -8,5 +8,5 @@
 - [Encrypting and Decrypting Files in Java](http://www.baeldung.com/java-cipher-input-output-stream)
 - [Hashing a Password in Java](https://www.baeldung.com/java-password-hashing)
 - [SSL Handshake Failures](https://www.baeldung.com/java-ssl-handshake-failures)
-- [SHA-256 Hashing in Java](https://www.baeldung.com/sha-256-hashing-java)
+- [SHA-256 and SHA3-256 Hashing in Java](https://www.baeldung.com/sha-256-hashing-java)
 - [Enabling TLS v1.2 in Java 7](https://www.baeldung.com/java-7-tls-v12)
diff --git a/core-kotlin/README.md b/core-kotlin/README.md
index 64ecd73b1c..7d8001d667 100644
--- a/core-kotlin/README.md
+++ b/core-kotlin/README.md
@@ -4,7 +4,7 @@
 - [A guide to the “when{}” block in Kotlin](http://www.baeldung.com/kotlin-when)
 - [Comprehensive Guide to Null Safety in Kotlin](http://www.baeldung.com/kotlin-null-safety)
 - [Kotlin Java Interoperability](http://www.baeldung.com/kotlin-java-interoperability)
-- [Difference Between “==” and “===” in Kotlin](http://www.baeldung.com/kotlin-equality-operators)
+- [Difference Between “==” and “===” operators in Kotlin](http://www.baeldung.com/kotlin-equality-operators)
 - [Generics in Kotlin](http://www.baeldung.com/kotlin-generics)
 - [Introduction to Kotlin Coroutines](http://www.baeldung.com/kotlin-coroutines)
 - [Destructuring Declarations in Kotlin](http://www.baeldung.com/kotlin-destructuring-declarations)
diff --git a/httpclient/README.md b/httpclient/README.md
index 93e0f3c9e1..7c5122c5b8 100644
--- a/httpclient/README.md
+++ b/httpclient/README.md
@@ -14,11 +14,11 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Unshorten URLs with HttpClient](http://www.baeldung.com/unshorten-url-httpclient)
 - [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
 - [HttpClient 4 – Follow Redirects for POST](http://www.baeldung.com/httpclient-redirect-on-http-post)
-- [HttpClient – Set Custom Header](http://www.baeldung.com/httpclient-custom-http-header)
+- [Custom HTTP Header with the HttpClient](http://www.baeldung.com/httpclient-custom-http-header)
 - [HttpClient Basic Authentication](http://www.baeldung.com/httpclient-4-basic-authentication)
 - [Multipart Upload with HttpClient 4](http://www.baeldung.com/httpclient-multipart-upload)
 - [HttpAsyncClient Tutorial](http://www.baeldung.com/httpasyncclient-tutorial)
 - [HttpClient 4 Tutorial](http://www.baeldung.com/httpclient-guide)
 - [Advanced HttpClient Configuration](http://www.baeldung.com/httpclient-advanced-config)
 - [HttpClient 4 – Do Not Follow Redirects](http://www.baeldung.com/httpclient-stop-follow-redirect)
-- [HttpClient 4 – Setting a Custom User-Agent](http://www.baeldung.com/httpclient-user-agent-header)
+- [Custom User-Agent in HttpClient 4](http://www.baeldung.com/httpclient-user-agent-header)
diff --git a/jackson/README.md b/jackson/README.md
index e201a06727..25194c7255 100644
--- a/jackson/README.md
+++ b/jackson/README.md
@@ -10,14 +10,14 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Jackson – Unmarshall to Collection/Array](http://www.baeldung.com/jackson-collection-array)
 - [Jackson Unmarshalling json with Unknown Properties](http://www.baeldung.com/jackson-deserialize-json-unknown-properties)
 - [Jackson – Custom Serializer](http://www.baeldung.com/jackson-custom-serialization)
-- [Jackson – Custom Deserializer](http://www.baeldung.com/jackson-deserialization)
+- [Getting Started with Custom Deserialization in Jackson](http://www.baeldung.com/jackson-deserialization)
 - [Jackson Exceptions – Problems and Solutions](http://www.baeldung.com/jackson-exception)
 - [Jackson Date](http://www.baeldung.com/jackson-serialize-dates)
 - [Jackson – Bidirectional Relationships](http://www.baeldung.com/jackson-bidirectional-relationships-and-infinite-recursion)
 - [Jackson JSON Tutorial](http://www.baeldung.com/jackson)
 - [Jackson – Working with Maps and nulls](http://www.baeldung.com/jackson-map-null-values-or-null-key)
 - [Jackson – Decide What Fields Get Serialized/Deserializaed](http://www.baeldung.com/jackson-field-serializable-deserializable-or-not)
-- [A Guide to Jackson Annotations](http://www.baeldung.com/jackson-annotations)
+- [Jackson Annotation Examples](http://www.baeldung.com/jackson-annotations)
 - [Working with Tree Model Nodes in Jackson](http://www.baeldung.com/jackson-json-node-tree-model)
 - [Jackson vs Gson](http://www.baeldung.com/jackson-vs-gson)
 - [Intro to the Jackson ObjectMapper](http://www.baeldung.com/jackson-object-mapper-tutorial)
@@ -25,7 +25,7 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [More Jackson Annotations](http://www.baeldung.com/jackson-advanced-annotations)
 - [Inheritance with Jackson](http://www.baeldung.com/jackson-inheritance)
 - [Guide to @JsonFormat in Jackson](http://www.baeldung.com/jackson-jsonformat)
-- [A Guide to Optional with Jackson](http://www.baeldung.com/jackson-optional)
+- [Using Optional with Jackson](http://www.baeldung.com/jackson-optional)
 - [Map Serialization and Deserialization with Jackson](http://www.baeldung.com/jackson-map)
 - [Jackson Streaming API](http://www.baeldung.com/jackson-streaming-api)
 - [Jackson – JsonMappingException (No serializer found for class)](http://www.baeldung.com/jackson-jsonmappingexception)
diff --git a/java-streams/README.md b/java-streams/README.md
index 15ea1c742a..b931c0d7d9 100644
--- a/java-streams/README.md
+++ b/java-streams/README.md
@@ -3,7 +3,7 @@
 ## Java Streams Cookbooks and Examples
 
 ### Relevant Articles: 
-- [Java 8 Streams Advanced](http://www.baeldung.com/java-8-streams)
+- [The Java 8 Stream API Tutorial](http://www.baeldung.com/java-8-streams)
 - [Introduction to Java 8 Streams](http://www.baeldung.com/java-8-streams-introduction)
 - [Java 8 and Infinite Streams](http://www.baeldung.com/java-inifinite-streams)
 - [Java 8 Stream findFirst() vs. findAny()](http://www.baeldung.com/java-stream-findfirst-vs-findany)
diff --git a/java-strings/README.md b/java-strings/README.md
index 3c401b4102..b342f53918 100644
--- a/java-strings/README.md
+++ b/java-strings/README.md
@@ -22,7 +22,7 @@
 - [Check if a String is a Palindrome](http://www.baeldung.com/java-palindrome)
 - [Comparing Strings in Java](http://www.baeldung.com/java-compare-strings)
 - [Check If a String Is Numeric in Java](http://www.baeldung.com/java-check-string-number)
-- [Why Use char[] Array Over a String for Storing Passwords in Java?](http://www.baeldung.com/java-storing-passwords)
+- [Use char[] Array Over a String for Manipulating Passwords in Java?](http://www.baeldung.com/java-storing-passwords)
 - [Convert a String to Title Case](http://www.baeldung.com/java-string-title-case)
 - [Compact Strings in Java 9](http://www.baeldung.com/java-9-compact-string)
 - [Java Check a String for Lowercase/Uppercase Letter, Special Character and Digit](https://www.baeldung.com/java-lowercase-uppercase-special-character-digit-regex)
diff --git a/jooby/README.md b/jooby/README.md
index 032e595354..aa867b2c56 100644
--- a/jooby/README.md
+++ b/jooby/README.md
@@ -1,3 +1,3 @@
 ## Relevant articles:
 
-- [Introduction to Jooby Project](http://www.baeldung.com/jooby)
+- [Introduction to Jooby](http://www.baeldung.com/jooby)
diff --git a/jsf/README.md b/jsf/README.md
index 6e0891182d..d96c1eb8e3 100644
--- a/jsf/README.md
+++ b/jsf/README.md
@@ -1,5 +1,5 @@
 ### Relevant Articles:
-- [Introduction to JSF Expression Language 3.0](http://www.baeldung.com/jsf-expression-language-el-3)
+- [Guide to JSF Expression Language 3.0](http://www.baeldung.com/jsf-expression-language-el-3)
 - [Introduction to JSF EL 2](http://www.baeldung.com/intro-to-jsf-expression-language)
 - [JavaServer Faces (JSF) with Spring](http://www.baeldung.com/spring-jsf)
 - [Introduction to Primefaces](http://www.baeldung.com/jsf-primefaces)
diff --git a/persistence-modules/hibernate5/README.md b/persistence-modules/hibernate5/README.md
index 026a5feb86..a37720a428 100644
--- a/persistence-modules/hibernate5/README.md
+++ b/persistence-modules/hibernate5/README.md
@@ -18,7 +18,7 @@
 - [@JoinColumn Annotation Explained](https://www.baeldung.com/jpa-join-column)
 - [Hibernate 5 Naming Strategy Configuration](https://www.baeldung.com/hibernate-naming-strategy)
 - [Proxy in Hibernate load() Method](https://www.baeldung.com/hibernate-proxy-load-method)
-- [Custom Types in Hibernate](https://www.baeldung.com/hibernate-custom-types)
+- [Custom Types in Hibernate and the @Type Annotation](https://www.baeldung.com/hibernate-custom-types)
 - [Criteria API – An Example of IN Expressions](https://www.baeldung.com/jpa-criteria-api-in-expressions)
 - [Difference Between @JoinColumn and mappedBy](https://www.baeldung.com/jpa-joincolumn-vs-mappedby)
 - [Hibernate 5 Bootstrapping API](https://www.baeldung.com/hibernate-5-bootstrapping-api)
diff --git a/persistence-modules/spring-boot-persistence/README.MD b/persistence-modules/spring-boot-persistence/README.MD
index 6fe5e6f05f..f62ca57a19 100644
--- a/persistence-modules/spring-boot-persistence/README.MD
+++ b/persistence-modules/spring-boot-persistence/README.MD
@@ -2,7 +2,7 @@
 
 - [Spring Boot with Multiple SQL Import Files](http://www.baeldung.com/spring-boot-sql-import-files)
 - [Configuring Separate Spring DataSource for Tests](http://www.baeldung.com/spring-testing-separate-data-source)
-- [Quick Guide on data.sql and schema.sql Files in Spring Boot](http://www.baeldung.com/spring-boot-data-sql-and-schema-sql)
+- [Quick Guide on Loading Initial Data with Spring Boot](http://www.baeldung.com/spring-boot-data-sql-and-schema-sql)
 - [Configuring a Tomcat Connection Pool in Spring Boot](https://www.baeldung.com/spring-boot-tomcat-connection-pool)
 - [Hibernate Field Naming with Spring Boot](https://www.baeldung.com/hibernate-field-naming-spring-boot)
 - [Integrating Spring Boot with HSQLDB](https://www.baeldung.com/spring-boot-hsqldb)
diff --git a/persistence-modules/spring-data-couchbase-2/README.md b/persistence-modules/spring-data-couchbase-2/README.md
index 2e56b25fef..2b6a1faddf 100644
--- a/persistence-modules/spring-data-couchbase-2/README.md
+++ b/persistence-modules/spring-data-couchbase-2/README.md
@@ -1,7 +1,7 @@
 ## Spring Data Couchbase Tutorial Project
 
 ### Relevant Articles:
-- [Spring Data Couchbase](http://www.baeldung.com/spring-data-couchbase)
+- [Intro to Spring Data Couchbase](http://www.baeldung.com/spring-data-couchbase)
 - [Entity Validation, Query Consistency, and Optimistic Locking in Spring Data Couchbase](http://www.baeldung.com/entity-validation-locking-and-query-consistency-in-spring-data-couchbase)
 - [Multiple Buckets and Spatial View Queries in Spring Data Couchbase](http://www.baeldung.com/spring-data-couchbase-buckets-and-spatial-view-queries)
 
diff --git a/persistence-modules/spring-hibernate-5/README.md b/persistence-modules/spring-hibernate-5/README.md
index 5e287919f1..c48e58fcca 100644
--- a/persistence-modules/spring-hibernate-5/README.md
+++ b/persistence-modules/spring-hibernate-5/README.md
@@ -2,4 +2,4 @@
 
 - [Hibernate Many to Many Annotation Tutorial](http://www.baeldung.com/hibernate-many-to-many)
 - [Programmatic Transactions in the Spring TestContext Framework](http://www.baeldung.com/spring-test-programmatic-transactions)
-- [Hibernate Criteria Queries](http://www.baeldung.com/hibernate-criteria-queries)
+- [JPA Criteria Queries](http://www.baeldung.com/hibernate-criteria-queries)
diff --git a/persistence-modules/spring-hibernate4/README.md b/persistence-modules/spring-hibernate4/README.md
index 57a341ed45..f2553ad229 100644
--- a/persistence-modules/spring-hibernate4/README.md
+++ b/persistence-modules/spring-hibernate4/README.md
@@ -3,8 +3,8 @@
 ## Spring with Hibernate 4 Example Project
 
 ### Relevant Articles: 
-- [Hibernate 4 with Spring](http://www.baeldung.com/hibernate-4-spring)
-- [The DAO with Spring 3 and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
+- [Guide to Hibernate 4 with Spring](http://www.baeldung.com/hibernate-4-spring)
+- [The DAO with Spring and Hibernate](http://www.baeldung.com/persistence-layer-with-spring-and-hibernate)
 - [Hibernate Pagination](http://www.baeldung.com/hibernate-pagination)
 - [Sorting with Hibernate](http://www.baeldung.com/hibernate-sort)
 - [Stored Procedures with Hibernate](http://www.baeldung.com/stored-procedures-with-hibernate-tutorial)
diff --git a/spark-java/README.md b/spark-java/README.md
index 711607bd4e..5abe78263c 100644
--- a/spark-java/README.md
+++ b/spark-java/README.md
@@ -3,4 +3,4 @@
 ## Spark Java Framework Tutorial Sample Project
 
 ### Relevant Articles
-- [Intro to Spark Java Framework](http://www.baeldung.com/spark-framework-rest-api)
+- [Building an API With the Spark Java Framework](http://www.baeldung.com/spark-framework-rest-api)
diff --git a/spring-5-reactive/README.md b/spring-5-reactive/README.md
index c39bb616f8..ef2f7d07eb 100644
--- a/spring-5-reactive/README.md
+++ b/spring-5-reactive/README.md
@@ -7,7 +7,7 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 - [Introduction to the Functional Web Framework in Spring 5](http://www.baeldung.com/spring-5-functional-web)
 - [Spring 5 WebClient](http://www.baeldung.com/spring-5-webclient)
-- [Exploring the Spring 5 MVC URL Matching Improvements](http://www.baeldung.com/spring-5-mvc-url-matching)
+- [Exploring the Spring 5 WebFlux URL Matching](http://www.baeldung.com/spring-5-mvc-url-matching)
 - [Reactive WebSockets with Spring 5](http://www.baeldung.com/spring-5-reactive-websockets)
 - [Spring Webflux Filters](http://www.baeldung.com/spring-webflux-filters)
 - [How to Set a Header on a Response with Spring 5](http://www.baeldung.com/spring-response-header)
diff --git a/spring-all/README.md b/spring-all/README.md
index 0d78efdcf2..81dd435007 100644
--- a/spring-all/README.md
+++ b/spring-all/README.md
@@ -11,11 +11,11 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 ### Relevant articles:
 
 - [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire)
-- [Properties with Spring](http://www.baeldung.com/properties-with-spring) - checkout the `org.baeldung.properties` package for all scenarios of properties injection and usage
+- [Properties with Spring and Spring Boot](http://www.baeldung.com/properties-with-spring) - checkout the `org.baeldung.properties` package for all scenarios of properties injection and usage
 - [Spring Profiles](http://www.baeldung.com/spring-profiles)
 - [A Spring Custom Annotation for a Better DAO](http://www.baeldung.com/spring-annotation-bean-pre-processor)
 - [What's New in Spring 4.3?](http://www.baeldung.com/whats-new-in-spring-4-3)
-- [Guide To Running Logic on Startup in Spring](http://www.baeldung.com/running-setup-logic-on-startup-in-spring)
+- [Running Setup Data on Startup in Spring](http://www.baeldung.com/running-setup-logic-on-startup-in-spring)
 - [Quick Guide to Spring Controllers](http://www.baeldung.com/spring-controllers)
 - [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes)
 - [Introduction To Ehcache](http://www.baeldung.com/ehcache)
@@ -28,7 +28,7 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Model, ModelMap, and ModelView in Spring MVC](http://www.baeldung.com/spring-mvc-model-model-map-model-view)
 - [A Guide To Caching in Spring](http://www.baeldung.com/spring-cache-tutorial)
 - [How To Do @Async in Spring](http://www.baeldung.com/spring-async)
-- [Quick Guide to the Spring @Order Annotation](http://www.baeldung.com/spring-order)
+- [@Order in Spring](http://www.baeldung.com/spring-order)
 - [Spring Web Contexts](http://www.baeldung.com/spring-web-contexts)
 - [Spring Cache – Creating a Custom KeyGenerator](http://www.baeldung.com/spring-cache-custom-keygenerator)
 - [Spring @Primary Annotation](http://www.baeldung.com/spring-primary)
diff --git a/spring-boot-bootstrap/README.md b/spring-boot-bootstrap/README.md
index 2186aa8fec..70fcd90118 100644
--- a/spring-boot-bootstrap/README.md
+++ b/spring-boot-bootstrap/README.md
@@ -1,5 +1,5 @@
 ### Relevant Articles:
-- [Bootstrap a Simple Application using Spring Boot](http://www.baeldung.com/spring-boot-start)
+- [Spring Boot Tutorial – Bootstrap a Simple Application](http://www.baeldung.com/spring-boot-start)
 - [Spring Boot Dependency Management with a Custom Parent](http://www.baeldung.com/spring-boot-dependency-management-custom-parent)
 - [Thin JARs with Spring Boot](http://www.baeldung.com/spring-boot-thin-jar)
 - [Deploying a Spring Boot Application to Cloud Foundry](https://www.baeldung.com/spring-boot-app-deploy-to-cloud-foundry)
diff --git a/spring-cloud/spring-cloud-gateway/README.MD b/spring-cloud/spring-cloud-gateway/README.MD
index 48fbf41b8e..d945ae949c 100644
--- a/spring-cloud/spring-cloud-gateway/README.MD
+++ b/spring-cloud/spring-cloud-gateway/README.MD
@@ -1,2 +1,2 @@
 ### Relevant Articles:
-- [Explore the new Spring Cloud Gateway](http://www.baeldung.com/spring-cloud-gateway)
+- [Exploring the new Spring Cloud Gateway](http://www.baeldung.com/spring-cloud-gateway)
diff --git a/spring-jms/README.md b/spring-jms/README.md
index b942cc72a0..55e74f18ff 100644
--- a/spring-jms/README.md
+++ b/spring-jms/README.md
@@ -1,2 +1,2 @@
 ### Relevant Articles:
-- [An Introduction To Spring JMS](http://www.baeldung.com/spring-jms)
+- [Getting Started with Spring JMS](http://www.baeldung.com/spring-jms)
diff --git a/spring-katharsis/README.md b/spring-katharsis/README.md
index cf2a001760..2082de2dda 100644
--- a/spring-katharsis/README.md
+++ b/spring-katharsis/README.md
@@ -6,4 +6,4 @@
 The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles: 
-- [JSON API in a Java Web Application](http://www.baeldung.com/json-api-java-spring-web-app)
+- [JSON API in a Spring Application](http://www.baeldung.com/json-api-java-spring-web-app)
diff --git a/spring-mvc-xml/README.md b/spring-mvc-xml/README.md
index 3199118281..dbc6125424 100644
--- a/spring-mvc-xml/README.md
+++ b/spring-mvc-xml/README.md
@@ -8,7 +8,7 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 
 ### Relevant Articles: 
-- [Servlet Session Timeout](http://www.baeldung.com/servlet-session-timeout)
+- [Java Session Timeout](http://www.baeldung.com/servlet-session-timeout)
 - [Returning Image/Media Data with Spring MVC](http://www.baeldung.com/spring-mvc-image-media-data)
 - [Geolocation by IP in Java](http://www.baeldung.com/geolocation-by-ip-with-maxmind)
 - [Guide to JavaServer Pages (JSP)](http://www.baeldung.com/jsp)
diff --git a/spring-remoting/README.md b/spring-remoting/README.md
index 7d344a3f27..0898b9b002 100644
--- a/spring-remoting/README.md
+++ b/spring-remoting/README.md
@@ -4,7 +4,7 @@
 - [Intro to Spring Remoting with HTTP Invokers](http://www.baeldung.com/spring-remoting-http-invoker)
 - [Spring Remoting with Hessian and Burlap](http://www.baeldung.com/spring-remoting-hessian-burlap)
 - [Spring Remoting with AMQP](http://www.baeldung.com/spring-remoting-amqp)
-- [Spring Remoting with JMS](http://www.baeldung.com/spring-remoting-jms)
+- [Spring Remoting with JMS and ActiveMQ](http://www.baeldung.com/spring-remoting-jms)
 - [Spring Remoting with RMI](http://www.baeldung.com/spring-remoting-rmi)
 
 ### Overview
diff --git a/spring-rest-full/README.md b/spring-rest-full/README.md
index 32b65ccc6a..ed6df1675f 100644
--- a/spring-rest-full/README.md
+++ b/spring-rest-full/README.md
@@ -12,7 +12,7 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 - [Introduction to Spring Data JPA](http://www.baeldung.com/the-persistence-layer-with-spring-data-jpa)
 - [Project Configuration with Spring](http://www.baeldung.com/project-configuration-with-spring)
 - [Metrics for your Spring REST API](http://www.baeldung.com/spring-rest-api-metrics)
-- [Bootstrap a Web Application with Spring 4](http://www.baeldung.com/bootstraping-a-web-application-with-spring-and-java-based-configuration)
+- [Bootstrap a Web Application with Spring 5](http://www.baeldung.com/bootstraping-a-web-application-with-spring-and-java-based-configuration)
 - [Spring Security Expressions - hasRole Example](https://www.baeldung.com/spring-security-expressions-basic)
 
 
diff --git a/spring-rest/src/main/java/com/baeldung/produceimage/README.md b/spring-rest/src/main/java/com/baeldung/produceimage/README.md
index acd546598d..4aeadea546 100644
--- a/spring-rest/src/main/java/com/baeldung/produceimage/README.md
+++ b/spring-rest/src/main/java/com/baeldung/produceimage/README.md
@@ -1,3 +1,3 @@
 ### Relevant articles
 
-- [Returning an Image or a File with Spring](http://www.baeldung.com/spring-controller-return-image-file)
+- [Download an Image or a File with Spring MVC](http://www.baeldung.com/spring-controller-return-image-file)
diff --git a/spring-resttemplate/README.md b/spring-resttemplate/README.md
index 1c8ddf73f9..353e9f955e 100644
--- a/spring-resttemplate/README.md
+++ b/spring-resttemplate/README.md
@@ -4,7 +4,7 @@
 The "REST With Spring" Classes: http://bit.ly/restwithspring
 
 ### Relevant Articles:
-- [Spring RestTemplate Tutorial](http://www.baeldung.com/rest-template)
+- [The Guide to RestTemplate](http://www.baeldung.com/rest-template)
 - [Exploring the Spring Boot TestRestTemplate](http://www.baeldung.com/spring-boot-testresttemplate)
 - [Spring RestTemplate Error Handling](http://www.baeldung.com/spring-rest-template-error-handling)
 - [Configure a RestTemplate with RestTemplateBuilder](http://www.baeldung.com/spring-rest-template-builder)
diff --git a/spring-security-core/README.md b/spring-security-core/README.md
index f7b3f6dffe..b38dc061b4 100644
--- a/spring-security-core/README.md
+++ b/spring-security-core/README.md
@@ -7,6 +7,6 @@ mvn clean install
 ```
 
 ### Relevant Articles:
-- [Intro to @PreFilter and @PostFilter in Spring Security](http://www.baeldung.com/spring-security-prefilter-postfilter)
+- [Spring Security – @PreFilter and @PostFilter](http://www.baeldung.com/spring-security-prefilter-postfilter)
 - [Spring Boot Authentication Auditing Support](http://www.baeldung.com/spring-boot-authentication-audit)
 - [Introduction to Spring Method Security](http://www.baeldung.com/spring-security-method-security)
diff --git a/spring-security-mvc-session/README.md b/spring-security-mvc-session/README.md
index fc44209640..ce40ed5f5f 100644
--- a/spring-security-mvc-session/README.md
+++ b/spring-security-mvc-session/README.md
@@ -7,7 +7,7 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 
 ### Relevant Articles: 
 - [HttpSessionListener Example – Monitoring](http://www.baeldung.com/httpsessionlistener_with_metrics)
-- [Spring Security Session Management](http://www.baeldung.com/spring-security-session)
+- [Control the Session with Spring Security](http://www.baeldung.com/spring-security-session)
 
 
 ### Build the Project
diff --git a/spring-security-rest-basic-auth/README.md b/spring-security-rest-basic-auth/README.md
index f92fcfe36b..30da3afbcf 100644
--- a/spring-security-rest-basic-auth/README.md
+++ b/spring-security-rest-basic-auth/README.md
@@ -6,8 +6,8 @@
 The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
 
 ### Relevant Articles: 
-- [RestTemplate with Basic Authentication in Spring](http://www.baeldung.com/how-to-use-resttemplate-with-basic-authentication-in-spring)
+- [Basic Authentication with the RestTemplate](http://www.baeldung.com/how-to-use-resttemplate-with-basic-authentication-in-spring)
 - [HttpClient Timeout](http://www.baeldung.com/httpclient-timeout)
 - [HttpClient with SSL](http://www.baeldung.com/httpclient-ssl)
-- [Writing a Custom Filter in Spring Security](http://www.baeldung.com/spring-security-custom-filter)
+- [A Custom Filter in the Spring Security Filter Chain](http://www.baeldung.com/spring-security-custom-filter)
 - [Spring Security Basic Authentication](http://www.baeldung.com/spring-security-basic-authentication)
diff --git a/testing-modules/junit-5/README.md b/testing-modules/junit-5/README.md
index d46f8bf1cf..d686396a1d 100644
--- a/testing-modules/junit-5/README.md
+++ b/testing-modules/junit-5/README.md
@@ -3,12 +3,12 @@
 - [A Guide to JUnit 5](http://www.baeldung.com/junit-5)
 - [A Guide to @RepeatedTest in Junit 5](http://www.baeldung.com/junit-5-repeated-test)
 - [Guide to Dynamic Tests in Junit 5](http://www.baeldung.com/junit5-dynamic-tests)
-- [A Guied to JUnit 5 Extensions](http://www.baeldung.com/junit-5-extensions)
+- [A Guide to JUnit 5 Extensions](http://www.baeldung.com/junit-5-extensions)
 - [Inject Parameters into JUnit Jupiter Unit Tests](http://www.baeldung.com/junit-5-parameters)
 - [Mockito and JUnit 5 – Using ExtendWith](http://www.baeldung.com/mockito-junit-5-extension)
 - [JUnit 5 – @RunWith](http://www.baeldung.com/junit-5-runwith)
 - [JUnit 5 @Test Annotation](http://www.baeldung.com/junit-5-test-annotation)
-- [JUnit Assert an Exception is Thrown](http://www.baeldung.com/junit-assert-exception)
+- [Assert an Exception is Thrown in JUnit 4 and 5](http://www.baeldung.com/junit-assert-exception)
 - [@Before vs @BeforeClass vs @BeforeEach vs @BeforeAll](http://www.baeldung.com/junit-before-beforeclass-beforeeach-beforeall)
 - [Migrating from JUnit 4 to JUnit 5](http://www.baeldung.com/junit-5-migration)
 - [JUnit5 Programmatic Extension Registration with @RegisterExtension](http://www.baeldung.com/junit-5-registerextension-annotation)
diff --git a/testing-modules/mockito/README.md b/testing-modules/mockito/README.md
index 158a1918e7..59954784f9 100644
--- a/testing-modules/mockito/README.md
+++ b/testing-modules/mockito/README.md
@@ -7,7 +7,7 @@
 - [Mockito Verify Cookbook](http://www.baeldung.com/mockito-verify)
 - [Mockito When/Then Cookbook](http://www.baeldung.com/mockito-behavior)
 - [Mockito – Using Spies](http://www.baeldung.com/mockito-spy)
-- [Mockito – @Mock, @Spy, @Captor and @InjectMocks](http://www.baeldung.com/mockito-annotations)
+- [Getting Started with Mockito @Mock, @Spy, @Captor and @InjectMocks](http://www.baeldung.com/mockito-annotations)
 - [Mockito’s Mock Methods](http://www.baeldung.com/mockito-mock-methods)
 - [Introduction to PowerMock](http://www.baeldung.com/intro-to-powermock)
 - [Mocking Exception Throwing using Mockito](http://www.baeldung.com/mockito-exceptions)
diff --git a/testing-modules/testing/README.md b/testing-modules/testing/README.md
index 849b578a55..e96b26ab41 100644
--- a/testing-modules/testing/README.md
+++ b/testing-modules/testing/README.md
@@ -3,7 +3,7 @@
 ## Mutation Testing
 
 ### Relevant Articles: 
-- [Introduction to Mutation Testing Using the PITest Library](http://www.baeldung.com/java-mutation-testing-with-pitest)
+- [Mutation Testing with PITest](http://www.baeldung.com/java-mutation-testing-with-pitest)
 - [Intro to JaCoCo](http://www.baeldung.com/jacoco)
 - [AssertJ’s Java 8 Features](http://www.baeldung.com/assertJ-java-8-features)
 - [AssertJ for Guava](http://www.baeldung.com/assertJ-for-guava)
diff --git a/vavr/README.md b/vavr/README.md
index 0857765ec6..266cae91bb 100644
--- a/vavr/README.md
+++ b/vavr/README.md
@@ -4,7 +4,7 @@
 - [Guide to Pattern Matching in Vavr](http://www.baeldung.com/vavr-pattern-matching)
 - [Property Testing Example With Vavr](http://www.baeldung.com/vavr-property-testing)
 - [Exceptions in Lambda Expression Using Vavr](http://www.baeldung.com/exceptions-using-vavr)
-- [Vavr (ex-Javaslang) Support in Spring Data](http://www.baeldung.com/spring-vavr)
+- [Vavr Support in Spring Data](http://www.baeldung.com/spring-vavr)
 - [Introduction to Vavr’s Validation API](http://www.baeldung.com/vavr-validation-api)
 - [Guide to Collections API in Vavr](http://www.baeldung.com/vavr-collections)
 - [Collection Factory Methods for Vavr](http://www.baeldung.com/vavr-collection-factory-methods)