diff --git a/api/src/main/java/org/apache/struts2/spi/ValueStack.java b/api/src/main/java/org/apache/struts2/spi/ValueStack.java
index 4a71d34aa..b3cd87b00 100644
--- a/api/src/main/java/org/apache/struts2/spi/ValueStack.java
+++ b/api/src/main/java/org/apache/struts2/spi/ValueStack.java
@@ -1,7 +1,7 @@
 package org.apache.struts2.spi;
 
 /**
- * A central fixture of the Struts Action framework, the {@code ValueStack} is a stack which contains the actions
+ * A central fixture of the Struts framework, the {@code ValueStack} is a stack which contains the actions
  * which have executed in addition to other objects. Users can get and set values on the stack using expressions. The
  * {@code ValueStack} will search down the stack starting with the most recent objects until it finds an object to
  * which the expression can apply.
diff --git a/apps/portlet/src/main/etc/jetspeed2/struts-portlet.psml b/apps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
index e99c74d3f..d6c795489 100644
--- a/apps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
+++ b/apps/portlet/src/main/etc/jetspeed2/struts-portlet.psml
@@ -4,8 +4,8 @@
      layout-decorator="tigris"
      portlet-decorator="tigris"
   />
-  <title>Struts Action 2.0 Portlet Example Application</title>
-  <metadata name="title" xml:lang="en">Struts Action 2.0 Portlet Example Application</metadata>
+  <title>Struts Portlet Example Application</title>
+  <metadata name="title" xml:lang="en">Struts Portlet Example Application</metadata>
 
   <fragment id="simplest" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
     <fragment id="struts-portlet-1" type="portlet" name="struts-portlet::StrutsPortlet">
diff --git a/apps/portlet/src/main/webapp/WEB-INF/portlet.xml b/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
index 7e226466d..501aa8557 100644
--- a/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
+++ b/apps/portlet/src/main/webapp/WEB-INF/portlet.xml
@@ -2,9 +2,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" id="struts-portlet">
   <portlet id="StrutsPortlet">
-    <description xml:lang="EN">Struts Action 2.0 Test Portlet</description>
+    <description xml:lang="EN">Struts Test Portlet</description>
     <portlet-name>StrutsPortlet</portlet-name>
-    <display-name xml:lang="EN">Struts Action 2.0 Test Portlet</display-name>
+    <display-name xml:lang="EN">Struts Test Portlet</display-name>
     
     <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
 
@@ -59,9 +59,9 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http:
   </portlet>
   
   <portlet id="StrutsPortlet2">
-    <description xml:lang="EN">Struts Action 2 Test Portlet2</description>
+    <description xml:lang="EN">Struts Test Portlet2</description>
     <portlet-name>StrutsPortlet2</portlet-name>
-    <display-name xml:lang="EN">Struts Action 2 Test Portlet2</display-name>
+    <display-name xml:lang="EN">Struts Test Portlet2</display-name>
     
     <portlet-class>org.apache.struts2.portlet.dispatcher.Jsr168Dispatcher</portlet-class>
 
diff --git a/apps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties b/apps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties
index f1ff6ecfc..c942705ab 100644
--- a/apps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties
+++ b/apps/shopping-cart/src/main/webapp/WEB-INF/velocity.properties
@@ -1,3 +1,3 @@
-# Velocity Macro libraries. The struts.vm comes standard with Struts Action 2. The tigris-macros.vm comes with the config
+# Velocity Macro libraries. The struts.vm comes standard with Struts. The tigris-macros.vm comes with the config
 # browser.
 velocimacro.library = struts.vm, tigris-macros.vm
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
index 7301b4d1b..514309b54 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/ajax/tree/Category.java
@@ -31,9 +31,7 @@ public class Category {
         new Category(1, "Root",
                 new Category(2, "Java",
                         new Category(3, "Web Frameworks",
-                                new Category(4, "WebWork"),
-                                new Category(5, "Struts Action"),
-                                new Category(6, "Struts Shale"),
+                                new Category(4, "Struts"),
                                 new Category(7, "Stripes"),
                                 new Category(8, "Rife")),
                         new Category(9, "Persistence",
diff --git a/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManagerUtil.java b/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManagerUtil.java
index a41d94261..4e344c724 100644
--- a/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManagerUtil.java
+++ b/apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/CustomFreemarkerManagerUtil.java
@@ -23,7 +23,7 @@ import java.util.Date;
 /**
  * This class is just a simple util that gets injected into 
  * {@link CustomFreemarkerManager} through Spring's constructor
- * injection, serving as a simple example in SAF2's Showcase. 
+ * injection, serving as a simple example in Struts' Showcase. 
  */
 public class CustomFreemarkerManagerUtil {
 
diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
index b40d9e12d..60282d10a 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
+++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
@@ -13,7 +13,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <title><decorator:title default="Struts Action Showcase"/></title>
+    <title><decorator:title default="Struts Showcase"/></title>
     <link href="<saf:url value='/styles/main.css'/>" rel="stylesheet" type="text/css" media="all"/>
     <link href="<saf:url value='/struts/niftycorners/niftyCorners.css'/>" rel="stylesheet" type="text/css"/>
     <link href="<saf:url value='/struts/niftycorners/niftyPrint.css'/>" rel="stylesheet" type="text/css" media="print"/>
@@ -42,7 +42,7 @@
     <div id="outer-header">
         <div id="header" class="clearfix">
             <div id="branding">
-                <h1 class="title">Struts Action Showcase</h1>
+                <h1 class="title">Struts Showcase</h1>
                 <saf:action id="dateAction" name="date" namespace="/" executeResult="true" />
             </div><!-- end branding -->
 
diff --git a/apps/showcase/src/main/webapp/WEB-INF/web.xml b/apps/showcase/src/main/webapp/WEB-INF/web.xml
index 10636105d..1f5be19bb 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/web.xml
+++ b/apps/showcase/src/main/webapp/WEB-INF/web.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
 
-    <display-name>SAF2 Showcase Application</display-name>
+    <display-name>Struts Showcase Application</display-name>
 
 	
     <filter>
diff --git a/apps/showcase/src/main/webapp/conversion/enterPersonInfo.jsp b/apps/showcase/src/main/webapp/conversion/enterPersonInfo.jsp
index 1d0d170f7..c1e22fca6 100644
--- a/apps/showcase/src/main/webapp/conversion/enterPersonInfo.jsp
+++ b/apps/showcase/src/main/webapp/conversion/enterPersonInfo.jsp
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Showcase - Conversion - Populate Object into SAF Action List</title>
+<title>Showcase - Conversion - Populate Object into Struts' action List</title>
 </head>
 <body>
 
 <p/>
-An example populating a list of object (Person.java) into SAF's action (PersonAction.java)
+An example populating a list of object (Person.java) into Struts' action (PersonAction.java)
 
 <p/>
 
diff --git a/apps/showcase/src/main/webapp/conversion/index.jsp b/apps/showcase/src/main/webapp/conversion/index.jsp
index 6d6826c9e..93b657bb4 100644
--- a/apps/showcase/src/main/webapp/conversion/index.jsp
+++ b/apps/showcase/src/main/webapp/conversion/index.jsp
@@ -8,7 +8,7 @@
 <body>
 
 <ul>
-	<li><saf:url id="url" action="enterPersonsInfo" namespace="/conversion" /><saf:a href="%{#url}">Populate into SAF action class a List of Person.java Object</saf:a></li>
+	<li><saf:url id="url" action="enterPersonsInfo" namespace="/conversion" /><saf:a href="%{#url}">Populate into the Struts action class a List of Person.java Object</saf:a></li>
 </ul>
 
 </body>
diff --git a/apps/showcase/src/main/webapp/conversion/showPersonInfo.jsp b/apps/showcase/src/main/webapp/conversion/showPersonInfo.jsp
index b0444513f..4eb8a8fd5 100644
--- a/apps/showcase/src/main/webapp/conversion/showPersonInfo.jsp
+++ b/apps/showcase/src/main/webapp/conversion/showPersonInfo.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Showcase - Conversion - Populate Object into SAF Action List</title>
+<title>Showcase - Conversion - Populate Object into Struts action List</title>
 </head>
 <body>
 
diff --git a/apps/showcase/src/main/webapp/jsf/index.jsp b/apps/showcase/src/main/webapp/jsf/index.jsp
index 3dd1065c1..41b5791a4 100644
--- a/apps/showcase/src/main/webapp/jsf/index.jsp
+++ b/apps/showcase/src/main/webapp/jsf/index.jsp
@@ -8,7 +8,7 @@
 <h1> JavaServer Faces Integration </h1>
 
 <p>
-The following pages show how Struts Action 2 and JSF components can work together,
+The following pages show how Struts and JSF components can work together,
 each doing what they do best.
 </p>
 
diff --git a/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl b/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
index ef6d42ea8..6b636de48 100644
--- a/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
+++ b/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefixExample.ftl
@@ -9,7 +9,7 @@
 		instead of the normal 'submit' action alias. <p/><p/>
 		
 		<b>Method Prefix</b><br/>
-		By clicking on the 'method prefix' button, the request will cuase SAF to invoke 'submit' 
+		By clicking on the 'method prefix' button, the request will cause Struts to invoke 'submit' 
 		action alias's 'alternateMethod' method instead of the default 'execute' method.<p/>
 		
 		<b>Redirect Prefix</b><br/>
diff --git a/build.xml b/build.xml
index 655d33702..121ab144f 100644
--- a/build.xml
+++ b/build.xml
@@ -37,7 +37,7 @@
         <echo>
             The default build only retrieves dependencies that released under a license compatible
             with the Apache Software Foundation.  To optionally download the optional LGPL dependencies
-            and compile the dependent Struts Action 2 code, run the 'compile-optional' task.
+            and compile the dependent Struts code, run the 'compile-optional' task.
         </echo>    
         
         <taskdef file="ant-build/ivy-tasks.properties" classpathref="cp" />
diff --git a/core/src/main/java/org/apache/struts2/components/Form.java b/core/src/main/java/org/apache/struts2/components/Form.java
index e14127ad1..504147e82 100644
--- a/core/src/main/java/org/apache/struts2/components/Form.java
+++ b/core/src/main/java/org/apache/struts2/components/Form.java
@@ -59,11 +59,11 @@ import java.util.Set;
  * determine the posting url
  * </li>
  * <li>
- * If the action is given, SAF will try to obtain an ActionConfig. This will be
+ * If the action is given, Struts will try to obtain an ActionConfig. This will be
  * successfull if the action attribute is a valid action alias defined xwork.xml.
  * </li>
  * <li>
- * If the action is given and is not an action alias defined in xwork.xmlm SAF
+ * If the action is given and is not an action alias defined in xwork.xml, Struts
  * will used the action attribute as if it is the posting url, separting the namespace
  * from it and using UrlHelper to generate the final url.
  * </li>
diff --git a/core/src/main/java/org/apache/struts2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java
index 70bf2f16d..cc78f1f70 100644
--- a/core/src/main/java/org/apache/struts2/components/Set.java
+++ b/core/src/main/java/org/apache/struts2/components/Set.java
@@ -34,7 +34,7 @@ import java.io.Writer;
  *   <li>session - the value will be set in session scope according to servlet spec. using the name as key </li>
  *   <li>request - the value will be set in request scope according to servlet spec. using the name as key </li>
  *   <li>page - the value will be set in request scope according to servlet sepc. using the name as key</li>
- *   <li>action - the value will be set in the request scope and SAF's action context using the name as key</li>
+ *   <li>action - the value will be set in the request scope and Struts' action context using the name as key</li>
  * </ul>
  * 
  * NOTE:<p/>
diff --git a/core/src/main/resources/org/apache/struts2/default.properties b/core/src/main/resources/org/apache/struts2/default.properties
index 6539fb7ac..40d870f71 100644
--- a/core/src/main/resources/org/apache/struts2/default.properties
+++ b/core/src/main/resources/org/apache/struts2/default.properties
@@ -55,7 +55,7 @@ struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper
 struts.action.extension=action
 
 ### Used by FilterDispatcher
-### If true then SAF serves static content from inside its jar. 
+### If true then Struts serves static content from inside its jar. 
 ### If false then the static content must be available at <context_path>/struts
 struts.serve.static=true
 
@@ -63,10 +63,10 @@ struts.serve.static=true
 ### This is good for development where one wants changes to the static content be
 ### fetch on each request. 
 ### NOTE: This will only have effect if struts.serve.static=true
-### If true -> SAF will write out header for static contents such that they will
+### If true -> Struts will write out header for static contents such that they will
 ###             be cached by web browsers (using Date, Cache-Content, Pragma, Expires)
 ###             headers).
-### If false -> SAF will write out header for static contents such that they are
+### If false -> Struts will write out header for static contents such that they are
 ###            NOT to be cached by web browser (using Cache-Content, Pragma, Expires
 ###            headers)
 struts.serve.static.browserCache=true