Merge branch 'asf-site' of https://git-wip-us.apache.org/repos/asf/storm-site into asfgit-site
diff --git a/_includes/footer.html b/_includes/footer.html
index f7dc274..6b13e45 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -14,8 +14,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -25,7 +25,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/_posts/2012-08-02-storm080-released.md b/_posts/2012-08-02-storm080-released.md
index d5636e4..f36cdda 100644
--- a/_posts/2012-08-02-storm080-released.md
+++ b/_posts/2012-08-02-storm080-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 0.8.0 and Trident released
+title: Apache Storm 0.8.0 and Trident released
 author: Nathan Marz
 ---
 
-I'm happy to announce the release of Storm 0.8.0. This is a *huge* release. Thanks to everyone who tested out the dev release and helped find and fix issues. And thanks to everyone who contributed pull requests. There's one big new thing available in the release: Trident. You may have heard me hint about Trident before, and now it's finally public. 
+I'm happy to announce the release of Apache Storm 0.8.0. This is a *huge* release. Thanks to everyone who tested out the dev release and helped find and fix issues. And thanks to everyone who contributed pull requests. There's one big new thing available in the release: Trident. You may have heard me hint about Trident before, and now it's finally public. 
 
-Trident is a higher level abstraction for Storm. It allows you to seamlessly mix high throughput (millions of messages per second), stateful stream processing with low latency distributed querying. If you're familiar with high level batch processing tools like Pig or Cascading, the concepts of Trident will be very familiar - Trident has joins, aggregations, grouping, functions, and filters. In addition to these, Trident adds primitives for doing stateful, incremental processing on top of any database or persistence store. Trident has consistent, exactly-once semantics, so it is easy to reason about Trident topologies. Trident is bundled with Storm, and you can read documentation about it on [this page](https://github.com/apache/incubator-storm/wiki/Documentation) (start with "Trident tutorial").
+Trident is a higher level abstraction for Apache Storm. It allows you to seamlessly mix high throughput (millions of messages per second), stateful stream processing with low latency distributed querying. If you're familiar with high level batch processing tools like Pig or Cascading, the concepts of Trident will be very familiar - Trident has joins, aggregations, grouping, functions, and filters. In addition to these, Trident adds primitives for doing stateful, incremental processing on top of any database or persistence store. Trident has consistent, exactly-once semantics, so it is easy to reason about Trident topologies. Trident is bundled with Apache Storm, and you can read documentation about it on [this page](https://github.com/apache/incubator-storm/wiki/Documentation) (start with "Trident tutorial").
 
 Trident supersedes both LinearDRPCTopologyBuilder and transactional topologies, both of which will be deprecated soon and eventually removed from the codebase. 
 
@@ -16,7 +16,7 @@
 Executors
 ---------
 
-Prior to Storm 0.8.0, a running topology consisted of some number of workers and some number of tasks that ran on those workers. In the old model, worker = process and task = thread. Storm 0.8.0 changes this model by introducing executors. In this model, a worker = process, an executor = thread, and one executor runs many tasks from the same spout/bolt. 
+Prior to Apache Storm 0.8.0, a running topology consisted of some number of workers and some number of tasks that ran on those workers. In the old model, worker = process and task = thread. Apache Storm 0.8.0 changes this model by introducing executors. In this model, a worker = process, an executor = thread, and one executor runs many tasks from the same spout/bolt. 
 
 The reason for the change is that the old model complected the semantics of the topology with its physical execution. For example, if you had a bolt with 4 tasks doing a fields grouping on some stream, in order to maintain the semantics of the fields grouping (that the same value always goes to the same task id for that bolt), the number of tasks for that bolt needs to be fixed for the lifetime of the topology, and since task = thread, the number of threads for that bolt is fixed for the lifetime of the topology. In the new model, the number of threads for a bolt is disassociated from the number of tasks, meaning you can change the number of threads for a spout/bolt dynamically without affecting semantics. Similarly, if you're keeping large amounts of state in your bolts, and you want to increase the parallelism of the bolt without having to repartition the state, you can do this with the new executors. 
 
@@ -42,7 +42,7 @@
 Throughput improvements
 -----------------------
 
-The internals of Storm have been rearchitected for extremely significant performance gains. I'm seeing throughput increases of anywhere from 5-10x of what it was before. I've benchmarked Storm at 1M tuples / sec / node on an internal Twitter cluster. 
+The internals of Apache Storm have been rearchitected for extremely significant performance gains. I'm seeing throughput increases of anywhere from 5-10x of what it was before. I've benchmarked Apache Storm at 1M tuples / sec / node on an internal Twitter cluster. 
 
 The key changes made were: 
 
@@ -58,26 +58,26 @@
 
 These may require some tweaking to optimize your topologies, but most likely the default values will work fine for you out of the box. 
 
-Decreased Zookeeper load / increased Storm UI performance
+Decreased Zookeeper load / increased Apache Storm UI performance
 -----------------------
-Storm sends significantly less traffic to Zookeeper now (on the order of 10x less). Since it also uses so many fewer znodes to store state, the UI is significantly faster as well. 
+Apache Storm sends significantly less traffic to Zookeeper now (on the order of 10x less). Since it also uses so many fewer znodes to store state, the UI is significantly faster as well. 
 
 Abstractions for shared resources
 -----------------------
 
-The TopologyContext has methods "getTaskData", "getExecutorData", and "getResource" for sharing resources at the task level, executor level, or worker level respectively. Currently you can't set any worker resources, but this is in development. Storm currently provides a shared ExecutorService worker resource (via "getSharedExecutor" method) that can be used for launching background tasks on a shared thread pool. 
+The TopologyContext has methods "getTaskData", "getExecutorData", and "getResource" for sharing resources at the task level, executor level, or worker level respectively. Currently you can't set any worker resources, but this is in development. Apache Storm currently provides a shared ExecutorService worker resource (via "getSharedExecutor" method) that can be used for launching background tasks on a shared thread pool. 
 
 Tick tuples
 -----------------------
 
 It's common to require a bolt to "do something" at a fixed interval, like flush writes to a database. Many people have been using variants of a ClockSpout to send these ticks. The problem with a ClockSpout is that you can't internalize the need for ticks within your bolt, so if you forget to set up your bolt correctly within your topology it won't work correctly. 0.8.0 introduces a new "tick tuple" config that lets you specify the frequency at which you want to receive tick tuples via the "topology.tick.tuple.freq.secs" component- specific config, and then your bolt will receive a tuple from the __system component and __tick stream at that frequency. 
 
-Improved Storm UI
+Improved Apache Storm UI
 -----------------------
 
-The Storm UI now has a button for showing/hiding the "system stats" (tuples sent on streams other than ones you've defined, like acker streams), making it easier to digest what your topology is doing.
+The Apache Storm UI now has a button for showing/hiding the "system stats" (tuples sent on streams other than ones you've defined, like acker streams), making it easier to digest what your topology is doing.
 
-Here's the full changelog for Storm 0.8.0: 
+Here's the full changelog for Apache Storm 0.8.0: 
 
  * Added Trident, the new high-level abstraction for intermixing high throughput, stateful stream processing with low-latency distributed querying 
  * Added executor abstraction between workers and tasks. Workers = processes, executors = threads that run many tasks from the same spout or bolt. 
diff --git a/_posts/2012-09-06-storm081-released.md b/_posts/2012-09-06-storm081-released.md
index da24349..10d39e9 100644
--- a/_posts/2012-09-06-storm081-released.md
+++ b/_posts/2012-09-06-storm081-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 0.8.1 released
+title: Apache Storm 0.8.1 released
 author: Nathan Marz
 ---
 
-Storm 0.8.1 is now available on the downloads page and in Maven. This release contains many bug fixes as well as a few important new features. These include: 
+Apache Storm 0.8.1 is now available on the downloads page and in Maven. This release contains many bug fixes as well as a few important new features. These include: 
 
-Storm's unit testing facilities have been exposed via Java
+Apache Storm's unit testing facilities have been exposed via Java
 -----------------------
 This is an extremely powerful API that lets you do things like: 
    a) Easily bring up and tear down local clusters 
@@ -17,7 +17,7 @@
 Spout wait strategies
 ---------------------
 
-There's two situations in which a spout needs to wait. The first is when the max spout pending limit is reached. The second is when nothing is emitted from nextTuple. Previously, Storm would just have that spout sit in a busy loop in those cases. What Storm does in those situations is now pluggable, and the default is now for the spout to sleep for 1 ms. This will cause the spout to use dramatically less CPU when it hits those cases, and it also obviates the need for spouts to do any sleeping in their implementation to be "polite". The wait strategy can be configured with TOPOLOGY_SPOUT_WAIT_STRATEGY and can be configured on a spout by spout basis. The interface to implement for a wait strategy is backtype.storm.spout.ISpoutWaitStrategy 
+There's two situations in which a spout needs to wait. The first is when the max spout pending limit is reached. The second is when nothing is emitted from nextTuple. Previously, Apache Storm would just have that spout sit in a busy loop in those cases. What Apache Storm does in those situations is now pluggable, and the default is now for the spout to sleep for 1 ms. This will cause the spout to use dramatically less CPU when it hits those cases, and it also obviates the need for spouts to do any sleeping in their implementation to be "polite". The wait strategy can be configured with TOPOLOGY_SPOUT_WAIT_STRATEGY and can be configured on a spout by spout basis. The interface to implement for a wait strategy is backtype.storm.spout.ISpoutWaitStrategy 
 
 The full changelog is below: 
 
diff --git a/_posts/2013-01-11-storm082-released.md b/_posts/2013-01-11-storm082-released.md
index e657d09..e13106e 100644
--- a/_posts/2013-01-11-storm082-released.md
+++ b/_posts/2013-01-11-storm082-released.md
@@ -1,10 +1,10 @@
 ---
 layout: post
-title: Storm 0.8.2 released
+title: Apache Storm 0.8.2 released
 author: Nathan Marz
 ---
 
-Storm 0.8.2 has been released and is available from [the downloads page](/downloads.html). This release contains a ton of improvements and fixes and is a highly recommended upgrade for everyone.
+Apache Storm 0.8.2 has been released and is available from [the downloads page](/downloads.html). This release contains a ton of improvements and fixes and is a highly recommended upgrade for everyone.
 
 Isolation Scheduler
 -------------------
@@ -15,16 +15,16 @@
 
 <script src="https://gist.github.com/4514691.js"></script>
 
-Any topologies submitted to the cluster not listed there will not be isolated. Note that there is no way for a user of Storm to affect their isolation settings – this is only allowed by the administrator of the cluster (this is very much intentional).
+Any topologies submitted to the cluster not listed there will not be isolated. Note that there is no way for a user of Apache Storm to affect their isolation settings – this is only allowed by the administrator of the cluster (this is very much intentional).
 
 The isolation scheduler solves the multi-tenancy problem – avoiding resource contention between topologies – by providing full isolation between topologies. The intention is that "productionized" topologies should be listed in the isolation config, and test or in-development topologies should not. The remaining machines on the cluster serve the dual role of failover for isolated topologies and for running the non-isolated topologies.
 
-Storm UI improvements
+Apache Storm UI improvements
 -------------------
 
-The Storm UI has also been made significantly more useful. There are new stats "#executed", "execute latency", and "capacity" tracked for all bolts. The "capacity" metric is very useful and tells you what % of the time in the last 10 minutes the bolt spent executing tuples. If this value is close to 1, then the bolt is "at capacity" and is a bottleneck in your topology. The solution to at-capacity bolts is to increase the parallelism of that bolt.
+The Apache Storm UI has also been made significantly more useful. There are new stats "#executed", "execute latency", and "capacity" tracked for all bolts. The "capacity" metric is very useful and tells you what % of the time in the last 10 minutes the bolt spent executing tuples. If this value is close to 1, then the bolt is "at capacity" and is a bottleneck in your topology. The solution to at-capacity bolts is to increase the parallelism of that bolt.
 
-Another useful improvement is the ability to kill, activate, deactivate, and rebalance topologies from the Storm UI.
+Another useful improvement is the ability to kill, activate, deactivate, and rebalance topologies from the Apache Storm UI.
 
 
 Important bug fixes
diff --git a/_posts/2013-12-08-storm090-released.md b/_posts/2013-12-08-storm090-released.md
index 8e1e948..e032226 100644
--- a/_posts/2013-12-08-storm090-released.md
+++ b/_posts/2013-12-08-storm090-released.md
@@ -1,23 +1,23 @@
 ---
 layout: post
-title: Storm 0.9.0 Released
+title: Apache Storm 0.9.0 Released
 author: P. Taylor Goetz
 ---
 
-We are pleased to announce that Storm 0.9.0 has been released and is available from [the downloads page](/downloads.html). This release represents an important milestone in the evolution of Storm.
+We are pleased to announce that Apache Storm 0.9.0 has been released and is available from [the downloads page](/downloads.html). This release represents an important milestone in the evolution of Apache Storm.
 
-While a number of new features have been added, a key focus area for this release has been stability-related fixes. Though many users are successfully running work-in-progress builds for Storm 0.9.x in production, this release represents the most stable version to-date, and is highly recommended for everyone, especially users of 0.8.x versions.
+While a number of new features have been added, a key focus area for this release has been stability-related fixes. Though many users are successfully running work-in-progress builds for Apache Storm 0.9.x in production, this release represents the most stable version to-date, and is highly recommended for everyone, especially users of 0.8.x versions.
 
 
 Netty Transport
 ---------------
-The first hightlight of this release is the new [Netty](http://netty.io/index.html) Transport contributed by [Yahoo! Engineering](http://yahooeng.tumblr.com/). Storm's core network transport mechanism is now plugable, and Storm now comes with two implementations: The original 0MQ transport, and a new Netty-based implementation.
+The first hightlight of this release is the new [Netty](http://netty.io/index.html) Transport contributed by [Yahoo! Engineering](http://yahooeng.tumblr.com/). Apache Storm's core network transport mechanism is now plugable, and Apache Storm now comes with two implementations: The original 0MQ transport, and a new Netty-based implementation.
 
-In earlier versions, Storm relied solely on 0MQ for transport. Since 0MQ is a native library, it was highly platform-dependent and, at times, challenging to install properly. In addition, stability between versions varied widely between versions and only a relatively old 0MQ version (2.1.7) was certified to work with Storm.
+In earlier versions, Apache Storm relied solely on 0MQ for transport. Since 0MQ is a native library, it was highly platform-dependent and, at times, challenging to install properly. In addition, stability between versions varied widely between versions and only a relatively old 0MQ version (2.1.7) was certified to work with Apache Storm.
 
-The Netty transport offers a pure Java alternative that eliminates Storm's dependency on native libraries. The Netty transport's performance is up to twice as fast as 0MQ, and it will open the door for authorization and authentication between worker processes. For an in-depth performance comparison of the 0MQ and Netty transports, see [this blog post](http://yahooeng.tumblr.com/post/64758709722/making-storm-fly-with-netty) by Storm contributor [Bobby Evans](https://github.com/revans2).
+The Netty transport offers a pure Java alternative that eliminates Apache Storm's dependency on native libraries. The Netty transport's performance is up to twice as fast as 0MQ, and it will open the door for authorization and authentication between worker processes. For an in-depth performance comparison of the 0MQ and Netty transports, see [this blog post](http://yahooeng.tumblr.com/post/64758709722/making-storm-fly-with-netty) by Apache Storm contributor [Bobby Evans](https://github.com/revans2).
 
-To configure Storm to use the Netty transport simply add the following to your `storm.yaml` configuration and adjust the values to best suit your use-case:
+To configure Apache Storm to use the Netty transport simply add the following to your `storm.yaml` configuration and adjust the values to best suit your use-case:
 
 ```
 storm.messaging.transport: "backtype.storm.messaging.netty.Context"
@@ -33,11 +33,11 @@
 
 Log Viewer UI
 -------------
-Storm now includes a helpful new feature for debugging and monitoring topologies: The `logviewer` daemon.
+Apache Storm now includes a helpful new feature for debugging and monitoring topologies: The `logviewer` daemon.
 
-In earlier versions of Storm, viewing worker logs involved determining a worker's location (host/port), typically through Storm UI, then `ssh`ing to that host and `tail`ing the corresponding worker log file. With the new log viewer. You can now easily access a specific worker's log in a web browser by clicking on a worker's port number right from Storm UI.
+In earlier versions of Apache Storm, viewing worker logs involved determining a worker's location (host/port), typically through Apache Storm UI, then `ssh`ing to that host and `tail`ing the corresponding worker log file. With the new log viewer. You can now easily access a specific worker's log in a web browser by clicking on a worker's port number right from Apache Storm UI.
 
-The `logviewer` daemon runs as a separate process on Storm supervisor nodes. To enable the `logviewer` run the following command (under supervision) on your cluster's supervisor nodes:
+The `logviewer` daemon runs as a separate process on Apache Storm supervisor nodes. To enable the `logviewer` run the following command (under supervision) on your cluster's supervisor nodes:
 
 ```
 $ storm logviewer
@@ -46,32 +46,32 @@
 
 Improved Windows Support
 ------------------------
-In previous versions, running Storm on Microsoft Windows required installing third-party binaries (0MQ), modifying Storm's source, and adding Windows-specific scripts. With the addition of the platform-independent Netty transport, as well as numerous enhancements to make Storm more platform-independent, running Storm on Windows is easier than ever.
+In previous versions, running Apache Storm on Microsoft Windows required installing third-party binaries (0MQ), modifying Apache Storm's source, and adding Windows-specific scripts. With the addition of the platform-independent Netty transport, as well as numerous enhancements to make Apache Storm more platform-independent, running Apache Storm on Windows is easier than ever.
 
 
 Security Improvements
 ---------------------
-Security, Authentication, and Authorization have been and will continue to be important focus areas for upcoming features. Storm 0.9.0 introduces an API for pluggable tuple serialization and a blowfish encryption based implementation for encrypting tuple data for sensitive use cases.
+Security, Authentication, and Authorization have been and will continue to be important focus areas for upcoming features. Apache Storm 0.9.0 introduces an API for pluggable tuple serialization and a blowfish encryption based implementation for encrypting tuple data for sensitive use cases.
 
 
 API Compatibility and Upgrading
 -------------------------------
-For most Storm topology developers, upgrading to 0.9.0 is simply a matter of updating the [dependency](https://clojars.org/storm). Storm's core API has changed very little since the 0.8.2 release.
+For most Apache Storm topology developers, upgrading to 0.9.0 is simply a matter of updating the [dependency](https://clojars.org/storm). Apache Storm's core API has changed very little since the 0.8.2 release.
 
-On the devops side, when upgrading to a new Storm release, it is safest to clear any existing state (Zookeeper, `storm.local.dir`), prior to upgrading.
+On the devops side, when upgrading to a new Apache Storm release, it is safest to clear any existing state (Zookeeper, `storm.local.dir`), prior to upgrading.
 
 Logging Changes
 ---------------
-Another important change in 0.9.0 has to do with logging. Storm has largely switched over to the [slf4j API](http://www.slf4j.org) (backed by a [logback](http://logback.qos.ch) logger implementation). Some Storm dependencies rely on the log4j API, so Storm currently depends on [log4j-over-slf4j](http://www.slf4j.org/legacy.html#log4j-over-slf4j).
+Another important change in 0.9.0 has to do with logging. Apache Storm has largely switched over to the [slf4j API](http://www.slf4j.org) (backed by a [logback](http://logback.qos.ch) logger implementation). Some Apache Storm dependencies rely on the log4j API, so Apache Storm currently depends on [log4j-over-slf4j](http://www.slf4j.org/legacy.html#log4j-over-slf4j).
 
 These changes have implications for existing topologies and topology components that use the log4j API.
 
-In general, and when possible, Storm topologies and topology components should use the [slf4j API](http://www.slf4j.org) for logging.
+In general, and when possible, Apache Storm topologies and topology components should use the [slf4j API](http://www.slf4j.org) for logging.
 
 
 Thanks
 ------
-Special thanks are due to all those who have contributed to Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.
+Special thanks are due to all those who have contributed to Apache Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.
 
 
 Changelog
diff --git a/_posts/2014-04-10-storm-logo-contest.md b/_posts/2014-04-10-storm-logo-contest.md
index 59f2a5d..9920920 100644
--- a/_posts/2014-04-10-storm-logo-contest.md
+++ b/_posts/2014-04-10-storm-logo-contest.md
@@ -4,9 +4,9 @@
 author: P. Taylor Goetz
 ---
 
-Apache Storm is a platform for distributed, real-time computation that has been undergoing incubation at Apache since September 18, 2013. You can contribute by helping establish the Storm brand by submitting a proposal for the Apache Storm logo.
+Apache Storm is a platform for distributed, real-time computation that has been undergoing incubation at Apache since September 18, 2013. You can contribute by helping establish the Apache Storm brand by submitting a proposal for the Apache Storm logo.
 
-Your proposal will be published on the [Storm project website](http://storm.incubator.apache.org) next to the other proposals. On **Wednesday, April 30, 2014** the community will choose the new logo through a vote on the [Apache Storm Mailing List](http://mail-archives.apache.org/mod_mbox/incubator-storm-dev/). If more than 10 proposals are received, voting will take place in two rounds, with the first round selecting 10 proposals to move to round two.
+Your proposal will be published on the [Apache Storm project website](http://storm.incubator.apache.org) next to the other proposals. On **Wednesday, April 30, 2014** the community will choose the new logo through a vote on the [Apache Storm Mailing List](http://mail-archives.apache.org/mod_mbox/incubator-storm-dev/). If more than 10 proposals are received, voting will take place in two rounds, with the first round selecting 10 proposals to move to round two.
 
 The winning artist will be credited on the Apache Storm website as having designed the logo, and may include a link to her/his website or blog. Prizes for the winner(s) are currently TBD.
 
@@ -22,7 +22,7 @@
  
 Optional, but nice to have:
  
- * Icons representing storm components (suitable for use in diagrams, presentations, etc.):
+ * Icons representing Apache Storm components (suitable for use in diagrams, presentations, etc.):
     * Spouts
     * Bolts
     * Streams
@@ -35,7 +35,7 @@
 
 ##INSPIRATION 
 
-While designing the logo, keep in mind what describes Storm: 
+While designing the logo, keep in mind what describes Apache Storm: 
 
  * Distributed Computation
  * High Performance
diff --git a/_posts/2014-05-27-round1-results.md b/_posts/2014-05-27-round1-results.md
index 49d46b0..e814fcd 100644
--- a/_posts/2014-05-27-round1-results.md
+++ b/_posts/2014-05-27-round1-results.md
@@ -6,12 +6,12 @@
 {{ page.title }}
 ================
 
-Round one of the Apache Storm logo contest is now complete and was a great success. We received votes from 7 PPMC members as well as 46 votes from the greater Storm community.
+Round one of the Apache Storm logo contest is now complete and was a great success. We received votes from 7 PPMC members as well as 46 votes from the greater Apache Storm community.
 
 We would like to extend a very special thanks to all those who took the time and effort to create and submit a logo proposal. We would also like to thank everyone who voted.
 
 ## Results ##
-The Storm PPMC and community votes were closely aligned, with the community vote resolving a PPMC tie for the 3rd finalist as shown in the result table below.
+The Apache Storm PPMC and community votes were closely aligned, with the community vote resolving a PPMC tie for the 3rd finalist as shown in the result table below.
 
 The three finalists entering the final round are:
 
diff --git a/_posts/2014-06-17-contest-results.md b/_posts/2014-06-17-contest-results.md
index 4b6b7de..67e9030 100644
--- a/_posts/2014-06-17-contest-results.md
+++ b/_posts/2014-06-17-contest-results.md
@@ -1,15 +1,15 @@
 ---
 layout: post
-title: Storm Logo Contest Results
+title: Apache Storm Logo Contest Results
 author: P. Taylor Goetz
 ---
 
-The Apache Storm logo contest is now complete and was a great success. We received votes from 7 PPMC members as well as 55 votes from the greater Storm community. Thank you to everyone who participated by voting.
+The Apache Storm logo contest is now complete and was a great success. We received votes from 7 PPMC members as well as 55 votes from the greater Apache Storm community. Thank you to everyone who participated by voting.
 
 ## The Winner ##
-Congratulations to Jennifer Lee, whose [3rd entry](/2014/04/29/logo-jlee2.html) received the most points from both the PPMC as well as the Storm community. Final vote tallies are listed below.
+Congratulations to Jennifer Lee, whose [3rd entry](/2014/04/29/logo-jlee2.html) received the most points from both the PPMC as well as the Apache Storm community. Final vote tallies are listed below.
 
-![Storm Logo](/images/logocontest/storm_logo_winner.png)
+![Apache Storm Logo](/images/logocontest/storm_logo_winner.png)
 
 The Apache Storm project management team will now begin the process of finalizing the logo and making it official.
 
diff --git a/_posts/2014-06-25-storm092-released.md b/_posts/2014-06-25-storm092-released.md
index 7f8c438..afe0e63 100644
--- a/_posts/2014-06-25-storm092-released.md
+++ b/_posts/2014-06-25-storm092-released.md
@@ -1,30 +1,30 @@
 ---
 layout: post
-title: Storm 0.9.2 released
+title: Apache Storm 0.9.2 released
 author: P. Taylor Goetz
 ---
 
-We are pleased to announce that Storm 0.9.2-incubating has been released and is available from [the downloads page](/downloads.html). This release includes many important fixes and improvements.
+We are pleased to announce that Apache Storm 0.9.2-incubating has been released and is available from [the downloads page](/downloads.html). This release includes many important fixes and improvements.
 
 Netty Transport Improvements
 ----------------------------
-Storm's Netty-based transport has been overhauled to significantly improve performance through better utilization of thread, CPU, and network resources, particularly in cases where message sizes are small. Storm contributor Sean Zhong ([@clockfly](https://github.com/clockfly)) deserves a great deal of credit not only for discovering, analyzing, documenting and fixing the root cause, but also for persevering through an extended review process and promptly addressing all concerns.
+Apache Storm's Netty-based transport has been overhauled to significantly improve performance through better utilization of thread, CPU, and network resources, particularly in cases where message sizes are small. Apache Storm contributor Sean Zhong ([@clockfly](https://github.com/clockfly)) deserves a great deal of credit not only for discovering, analyzing, documenting and fixing the root cause, but also for persevering through an extended review process and promptly addressing all concerns.
 
 Those interested in the technical details and evolution of this patch can find out more in the [JIRA ticket for STORM-297](https://issues.apache.org/jira/browse/STORM-297).
 
-Sean also discovered and fixed an [elusive bug](https://issues.apache.org/jira/browse/STORM-342) in Storm's usage of the Disruptor queue that could lead to out-of-order or lost messages. 
+Sean also discovered and fixed an [elusive bug](https://issues.apache.org/jira/browse/STORM-342) in Apache Storm's usage of the Disruptor queue that could lead to out-of-order or lost messages. 
 
 Many thanks to Sean for contributing these important fixes.
 
-Storm UI Improvements
+Apache Storm UI Improvements
 ---------------------
-This release also includes a number of improvements to the Storm UI service. Contributor Sriharsha Chintalapani([@harshach](https://github.com/harshach)) added a REST API to the Storm UI service to expose metrics and operations in JSON format, and updated the UI to use that API.
+This release also includes a number of improvements to the Apache Storm UI service. Contributor Sriharsha Chintalapani([@harshach](https://github.com/harshach)) added a REST API to the Apache Storm UI service to expose metrics and operations in JSON format, and updated the UI to use that API.
 
-The new REST API will make it considerably easier for other services to consume availabe cluster and topology metrics for monitoring and visualization applications. Kyle Nusbaum ([@knusbaum](https://github.com/knusbaum)) has already leveraged the REST API to create a topology visualization tool now included in Storm UI and illustrated in the screenshot below.
+The new REST API will make it considerably easier for other services to consume availabe cluster and topology metrics for monitoring and visualization applications. Kyle Nusbaum ([@knusbaum](https://github.com/knusbaum)) has already leveraged the REST API to create a topology visualization tool now included in Apache Storm UI and illustrated in the screenshot below.
 
 &nbsp;
 
-![Storm UI Topology Visualization](/images/ui_topology_viz.png)
+![Apache Storm UI Topology Visualization](/images/ui_topology_viz.png)
 
 &nbsp;
 
@@ -32,11 +32,11 @@
 
 Kafka Spout
 -----------
-This is the first Storm release to include official support for consuming data from Kafka 0.8.x. In the past, development of Kafka spouts for Storm had become somewhat fragmented and finding an implementation that worked with certain versions of Storm and Kafka proved burdensome for some developers. This is no longer the case, as the `storm-kafka` module is now part of the Storm project and associated artifacts are released to official channels (Maven Central) along with Storm's other components.
+This is the first Apache Storm release to include official support for consuming data from Kafka 0.8.x. In the past, development of Kafka spouts for Apache Storm had become somewhat fragmented and finding an implementation that worked with certain versions of Apache Storm and Kafka proved burdensome for some developers. This is no longer the case, as the `storm-kafka` module is now part of the Apache Storm project and associated artifacts are released to official channels (Maven Central) along with Apache Storm's other components.
 
-Thanks are due to GitHub user [@wurstmeister]() for picking up Nathan Marz' original Kafka 0.7.x implementation, updating it to work with Kafka 0.8.x, and contributing that work back to the Storm community.
+Thanks are due to GitHub user [@wurstmeister]() for picking up Nathan Marz' original Kafka 0.7.x implementation, updating it to work with Kafka 0.8.x, and contributing that work back to the Apache Storm community.
 
-The `storm-kafka` module can be found in the `/external/` directory of the source tree and binary distributions. The `external` area has been set up to contain projects that while not required by Storm, are often used in conjunction with Storm to integrate with some other technology. Such projects also come with a maintenance committment from at least one Storm committer to ensure compatibility with Storm's main codebase as it evolves.
+The `storm-kafka` module can be found in the `/external/` directory of the source tree and binary distributions. The `external` area has been set up to contain projects that while not required by Apache Storm, are often used in conjunction with Apache Storm to integrate with some other technology. Such projects also come with a maintenance committment from at least one Apache Storm committer to ensure compatibility with Apache Storm's main codebase as it evolves.
 
 The `storm-kafka` dependency is available now from Maven Central at the following coordinates:
 
@@ -48,22 +48,22 @@
 Users, and Scala developers in particular, should note that the Kafka dependency is listed as `provided`. This allows users to choose a specific Scala version as described in the [project README](https://github.com/apache/incubator-storm/tree/v0.9.2-incubating/external/storm-kafka).
 
 
-Storm Starter and Examples
+Apache Storm Starter and Examples
 --------------------------
 
-Similar to the `external` section of the codebase, we have also added an `examples` directory and pulled in the `storm-starter` project to ensure it will be maintained in lock-step with Storm's main codebase.
+Similar to the `external` section of the codebase, we have also added an `examples` directory and pulled in the `storm-starter` project to ensure it will be maintained in lock-step with Apache Storm's main codebase.
 
-Thank you to Storm committer Michael G. Noll for his continued work in maintaining and improving the `storm-starter` project.
+Thank you to Apache Storm committer Michael G. Noll for his continued work in maintaining and improving the `storm-starter` project.
 
 
 Plugable Serialization for Multilang
 ------------------------------------
-In previous versions of Storm, serialization of data to and from multilang components was limited to JSON, imposing somewhat of performance penalty. Thanks to a contribution from John Gilmore ([@jsgilmore](https://github.com/jsgilmore)) the serialization mechanism is now plugable and enables the use of more performant serialization frameworks like protocol buffers in addition to JSON.
+In previous versions of Apache Storm, serialization of data to and from multilang components was limited to JSON, imposing somewhat of performance penalty. Thanks to a contribution from John Gilmore ([@jsgilmore](https://github.com/jsgilmore)) the serialization mechanism is now plugable and enables the use of more performant serialization frameworks like protocol buffers in addition to JSON.
 
 
 Thanks
 ------
-Special thanks are due to all those who have contributed to Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.
+Special thanks are due to all those who have contributed to Apache Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.
 
 
 Changelog
diff --git a/_posts/2014-10-20-storm093-release-candidate.md b/_posts/2014-10-20-storm093-release-candidate.md
index 6270283..2df4275 100644
--- a/_posts/2014-10-20-storm093-release-candidate.md
+++ b/_posts/2014-10-20-storm093-release-candidate.md
@@ -1,11 +1,11 @@
 ---
 layout: post
-title: Storm 0.9.3 release candidate 1 available
+title: Apache Storm 0.9.3 release candidate 1 available
 author: Michael G. Noll
 ---
 
 We are pleased to announce that Apache Storm version 0.9.3 has reached the release candidate stage.  The latest release is 0.9.3-rc1.  We are moving closer to the GA release, so this is a good time to give this new 0.9.3 version a try!
 
-Storm 0.9.3 is a maintenance release with bug fixes and better stability as summarized in the [0.9.3 changelog](https://github.com/apache/storm/blob/master/CHANGELOG.md).  On top of that version 0.9.3 continues to improve the integration with [Apache Kafka](http://kafka.apache.org/) as well as the [documentation of the core spout and Trident spout for Kafka](https://github.com/apache/storm/blob/master/external/storm-kafka/README.md), which will provide our users with the best Kafka connectivity for Storm to date.
+Apache Storm 0.9.3 is a maintenance release with bug fixes and better stability as summarized in the [0.9.3 changelog](https://github.com/apache/storm/blob/master/CHANGELOG.md).  On top of that version 0.9.3 continues to improve the integration with [Apache Kafka](http://kafka.apache.org/) as well as the [documentation of the core spout and Trident spout for Kafka](https://github.com/apache/storm/blob/master/external/storm-kafka/README.md), which will provide our users with the best Kafka connectivity for Apache Storm to date.
 
-We heartily encourage you to [test the 0.9.3 release candidate](http://storm.apache.org/downloads.html) and provide your feedback regarding any issues via [our mailing lists](http://storm.apache.org/community.html), which is an easy and valuable way to contribute back to the Storm community and to help us moving to an official 0.9.3 release.  You can find the [0.9.3 release candidate in our Downloads section](http://storm.apache.org/downloads.html).
+We heartily encourage you to [test the 0.9.3 release candidate](http://storm.apache.org/downloads.html) and provide your feedback regarding any issues via [our mailing lists](http://storm.apache.org/community.html), which is an easy and valuable way to contribute back to the Apache Storm community and to help us moving to an official 0.9.3 release.  You can find the [0.9.3 release candidate in our Downloads section](http://storm.apache.org/downloads.html).
diff --git a/_posts/2014-11-25-storm093-released.md b/_posts/2014-11-25-storm093-released.md
index df3da75..6c80854 100644
--- a/_posts/2014-11-25-storm093-released.md
+++ b/_posts/2014-11-25-storm093-released.md
@@ -1,6 +1,6 @@
 ---
 layout: post
-title: Storm 0.9.3 released
+title: Apache Storm 0.9.3 released
 author: P. Taylor Goetz
 ---
 
@@ -11,9 +11,9 @@
 
 Apache Storm has supported [Apache Kafka](http://kafka.apache.org/) as a streaming data source since version 0.9.2-incubating. Version 0.9.3 brings a number of improvements to the Kafka integration including the ability to write data to one or more Kafka clusters and topics.
 
-The ability to both read from and write to Kafka further unlocks potential of the already powerful combination of Storm and Kafka. Storm users can now use Kafka as a source of and destination for streaming data. This allows for inter-topology communication, topology chaining, combining spout/bolt-based topologies with Trident-based data flows, and integration with any external system that supports data ingest from Kafka.
+The ability to both read from and write to Kafka further unlocks potential of the already powerful combination of Apache Storm and Kafka. Apache Storm users can now use Kafka as a source of and destination for streaming data. This allows for inter-topology communication, topology chaining, combining spout/bolt-based topologies with Trident-based data flows, and integration with any external system that supports data ingest from Kafka.
 
-More information about Storm's Kafka integration can be found in the [storm-kafka project documentation](https://github.com/apache/storm/blob/v0.9.3/external/storm-kafka/README.md).
+More information about Apache Storm's Kafka integration can be found in the [storm-kafka project documentation](https://github.com/apache/storm/blob/v0.9.3/external/storm-kafka/README.md).
 
 
 HDFS Integration
@@ -21,23 +21,23 @@
 
 Many stream processing use cases involve storing data in HDFS for further analysis and offline (batch) processing. Apache Storm’s HDFS integration consists of several bolt and Trident state implementations that allow topology developers to easily write data to HDFS from any Storm topology. 
 
-More information about Storm's HDFS integration can be found in the [storm-hdfs project documentation](https://github.com/apache/storm/tree/v0.9.3/external/storm-hdfs).
+More information about Apache Storm's HDFS integration can be found in the [storm-hdfs project documentation](https://github.com/apache/storm/tree/v0.9.3/external/storm-hdfs).
 
 
 HBase Integration
 -----------------
 
-Apache Storm’s HBase integration includes a number of components that allow Storm topologies to both write to and query HBase in real-time. Many organizations use Apache HBase as part of their big data strategy for batch, interactive, and real-time workflows. Storm’s HBase integration allows users to leverage data assets in HBase as streaming queries, as well as using HBase as a destination for streaming computation results.
+Apache Storm’s HBase integration includes a number of components that allow Apache Storm topologies to both write to and query HBase in real-time. Many organizations use Apache HBase as part of their big data strategy for batch, interactive, and real-time workflows. Apache Storm HBase integration allows users to leverage data assets in HBase as streaming queries, as well as using HBase as a destination for streaming computation results.
 
-More information about Storm's HBase integration can be found in the [storm-hbase project documentation](https://github.com/apache/storm/tree/v0.9.3/external/storm-hbase).
+More information about Apache Storm's HBase integration can be found in the [storm-hbase project documentation](https://github.com/apache/storm/tree/v0.9.3/external/storm-hbase).
 
 Reduced Dependency Conflicts
 ----------------------------
-In previous Storm releases, it was not uncommon for users' topology dependencies to conflict with the libraries used by Storm. In Storm 0.9.3 several dependency packages that were common sources of conflicts have been package-relocated (shaded) to avoid this situation. Developers are free to use the Storm-packaged versions, or supply their own version. 
+In previous Apache Storm releases, it was not uncommon for users' topology dependencies to conflict with the libraries used by Apache Storm. In Apache Storm 0.9.3 several dependency packages that were common sources of conflicts have been package-relocated (shaded) to avoid this situation. Developers are free to use the Storm-packaged versions, or supply their own version. 
 
 The following table lists the dependency package relocations:
 
-| Dependency  | Original Package | Storm Package |
+| Dependency  | Original Package | Apache Storm Package |
 |:---|:---|:---|
 | Apache Thrift | `org.apache.thrift` | `org.apache.thrift7` |
 | Netty | `org.jboss.netty` | `org.apache.storm.netty` |
@@ -56,7 +56,7 @@
 
 Thanks
 ------
-Special thanks are due to all those who have contributed to Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.
+Special thanks are due to all those who have contributed to Apache Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.
 
 
 Full Changelog
diff --git a/_posts/2015-03-25-storm094-released.md b/_posts/2015-03-25-storm094-released.md
index 0119e38..01e2d1c 100644
--- a/_posts/2015-03-25-storm094-released.md
+++ b/_posts/2015-03-25-storm094-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 0.9.4 released
+title: Apache Storm 0.9.4 released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 0.9.4 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2015-06-04-storm095-released.md b/_posts/2015-06-04-storm095-released.md
index 1d018c0..80ac344 100644
--- a/_posts/2015-06-04-storm095-released.md
+++ b/_posts/2015-06-04-storm095-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 0.9.5 released
+title: Apache Storm 0.9.5 released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 0.9.5 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2015-06-15-storm0100-beta-released.md b/_posts/2015-06-15-storm0100-beta-released.md
index 87dda1b..7a65004 100644
--- a/_posts/2015-06-15-storm0100-beta-released.md
+++ b/_posts/2015-06-15-storm0100-beta-released.md
@@ -1,6 +1,6 @@
 ---
 layout: post
-title: Storm 0.10.0 Beta Released
+title: Apache Storm 0.10.0 Beta Released
 author: P. Taylor Goetz
 ---
 
@@ -11,11 +11,11 @@
 Secure, Multi-Tenant Deployment
 --------------------------------
 
-Much like the early days of Hadoop, Apache Storm originally evolved in an environment where security was not a high-priority concern. Rather, it was assumed that Storm would be deployed to environments suitably cordoned off from security threats. While a large number of users were comfortable setting up their own security measures for Storm (usually at the Firewall/OS level), this proved a hindrance to broader adoption among larger enterprises where security policies prohibited deployment without specific safeguards.
+Much like the early days of Hadoop, Apache Storm originally evolved in an environment where security was not a high-priority concern. Rather, it was assumed that Apache Storm would be deployed to environments suitably cordoned off from security threats. While a large number of users were comfortable setting up their own security measures for Apache Storm (usually at the Firewall/OS level), this proved a hindrance to broader adoption among larger enterprises where security policies prohibited deployment without specific safeguards.
 
-Yahoo! hosts one of the largest Storm deployments in the world, and their engineering team recognized the need for security early on, so it implemented many of the features necessary to secure its own Apache Storm deployment. Yahoo!, Hortonworks, Symantec, and the broader Apache Storm community have worked together to bring those security innovations into the main Apache Storm code base.
+Yahoo! hosts one of the largest Apache Storm deployments in the world, and their engineering team recognized the need for security early on, so it implemented many of the features necessary to secure its own Apache Storm deployment. Yahoo!, Hortonworks, Symantec, and the broader Apache Storm community have worked together to bring those security innovations into the main Apache Storm code base.
 
-We are pleased to announce that work is now complete. Some of the highlights of Storm's new security features include:
+We are pleased to announce that work is now complete. Some of the highlights of Apache Storm's new security features include:
 
  * Kerberos Authentication with Automatic Credential Push and Renewal
  * Pluggable Authorization and ACLs
@@ -25,21 +25,21 @@
  * Secure integration with other Hadoop Projects (such as ZooKeeper, HDFS, HBase, etc.)
  * User isolation (Storm topologies run as the user who submitted them)
 
-For more details and instructions for securing Storm, please see [the security documentation](https://github.com/apache/storm/blob/v0.10.0-beta/SECURITY.md).
+For more details and instructions for securing Apache Storm, please see [the security documentation](https://github.com/apache/storm/blob/v0.10.0-beta/SECURITY.md).
 
 A Foundation for Rolling Upgrades and Continuity of Operations
 --------------------------------------------------------------
 
-In the past, upgrading a Storm cluster could be an arduous process that involved un-deploying existing topologies, removing state from local disk and ZooKeeper, installing the upgrade, and finally redeploying topologies. From an operations perspective, this process was disruptive to say the very least.
+In the past, upgrading an Apache Storm cluster could be an arduous process that involved un-deploying existing topologies, removing state from local disk and ZooKeeper, installing the upgrade, and finally redeploying topologies. From an operations perspective, this process was disruptive to say the very least.
 
-The underlying cause of this headache was rooted in the data format Storm processes used to store both local and distributed state. Between versions, these data structures would change in incompatible ways.
+The underlying cause of this headache was rooted in the data format Apache Storm processes used to store both local and distributed state. Between versions, these data structures would change in incompatible ways.
 
-Beginning with version 0.10.0, this limitation has been eliminated. In the future, upgrading from Storm 0.10.0 to a newer version can be accomplished seamlessly, with zero down time. In fact, for users who use [Apache Ambari](https://ambari.apache.org) for cluster provisioning and management, the process can be completely automated.
+Beginning with version 0.10.0, this limitation has been eliminated. In the future, upgrading from Apache Storm 0.10.0 to a newer version can be accomplished seamlessly, with zero down time. In fact, for users who use [Apache Ambari](https://ambari.apache.org) for cluster provisioning and management, the process can be completely automated.
 
 
 Easier Deployment and Declarative Topology Wiring with Flux
 ----------------------------------------------------------
-Apache Storm 0.10.0 now includes Flux, which is a framework and set of utilities that make defining and deploying Storm topologies less painful and developer-intensive. A common pain point mentioned by Storm users is the fact that the wiring for a Topology graph is often tied up in Java code, and that any changes require recompilation and repackaging of the topology jar file. Flux aims to alleviate that pain by allowing you to package all your Storm components in a single jar, and use an external text file to define the layout and configuration of your topologies.
+Apache Storm 0.10.0 now includes Flux, which is a framework and set of utilities that make defining and deploying Apache Storm topologies less painful and developer-intensive. A common pain point mentioned by Apache Storm users is the fact that the wiring for a Topology graph is often tied up in Java code, and that any changes require recompilation and repackaging of the topology jar file. Flux aims to alleviate that pain by allowing you to package all your Apache Storm components in a single jar, and use an external text file to define the layout and configuration of your topologies.
 
 Some of Flux' features include:
 
@@ -54,16 +54,16 @@
 
 Partial Key Groupings
 ---------------------
-In addition to the standard Stream Groupings Storm has always supported, version 0.10.0 introduces a new grouping named "Partial Key Grouping". With the Partial Stream Grouping, the tuple  stream is partitioned by the fields specified in the grouping, like the Fields Grouping, but are load balanced between two downstream bolts, which provides better utilization of resources when the incoming data is skewed. 
+In addition to the standard Stream Groupings Apache Storm has always supported, version 0.10.0 introduces a new grouping named "Partial Key Grouping". With the Partial Stream Grouping, the tuple  stream is partitioned by the fields specified in the grouping, like the Fields Grouping, but are load balanced between two downstream bolts, which provides better utilization of resources when the incoming data is skewed. 
 
-Documentation for the Partial Key Grouping and other stream groupings supported by Storm can be found [here](https://storm.apache.org/documentation/Concepts.html). [This research paper](https://melmeric.files.wordpress.com/2014/11/the-power-of-both-choices-practical-load-balancing-for-distributed-stream-processing-engines.pdf) provides additional details regarding how it works and its advantages.
+Documentation for the Partial Key Grouping and other stream groupings supported by Apache Storm can be found [here](https://storm.apache.org/documentation/Concepts.html). [This research paper](https://melmeric.files.wordpress.com/2014/11/the-power-of-both-choices-practical-load-balancing-for-distributed-stream-processing-engines.pdf) provides additional details regarding how it works and its advantages.
 
 
 Improved Logging Framework
 --------------------------
-Debugging distributed applications can be difficult, and usually focuses on one main source of information: application log files. But in a very low latency system like Storm where every millisecond counts, logging can be a double-edged sword: If you log too little information you may miss the information you need to solve a problem; log too much and you risk degrading the overall performance of your application as resources are consumed by the logging framework.
+Debugging distributed applications can be difficult, and usually focuses on one main source of information: application log files. But in a very low latency system like Apache Storm where every millisecond counts, logging can be a double-edged sword: If you log too little information you may miss the information you need to solve a problem; log too much and you risk degrading the overall performance of your application as resources are consumed by the logging framework.
 
-In version 0.10.0 Storm's logging framework now uses [Apache Log4j 2](http://logging.apache.org/log4j/2.x/) which, like Storm's internal messaging subsystem, uses the extremely performant [LMAX Disruptor](https://lmax-exchange.github.io/disruptor/) messaging library. Log4j 2 boast an 18x higher throughput and orders of magnitude lower latency than Storm's previous logging framework. More efficient resource utilization at the logging level means more resources are available where they matter most: executing your business logic.
+In version 0.10.0 Apache Storm's logging framework now uses [Apache Log4j 2](http://logging.apache.org/log4j/2.x/) which, like Apache Storm's internal messaging subsystem, uses the extremely performant [LMAX Disruptor](https://lmax-exchange.github.io/disruptor/) messaging library. Log4j 2 boast an 18x higher throughput and orders of magnitude lower latency than Apache Storm's previous logging framework. More efficient resource utilization at the logging level means more resources are available where they matter most: executing your business logic.
 
 A few of the important features these changes bring include:
 
@@ -78,51 +78,51 @@
 ---------------------------------
 Introduced in version 0.13, [Apache Hive](https://hive.apache.org) includes a [Streaming Data Ingest API](https://cwiki.apache.org/confluence/display/Hive/Streaming+Data+Ingest) that allows data to be written continuously into Hive. The incoming data can be continuously committed in small batches of records into existing Hive partition or table. Once the data is committed its immediately visible to all hive queries.
 
-Apache Storm 0.10.0 introduces both a Storm Core API bolt implementation 
-that allows users to stream data from Storm directly into hive. Storm's Hive integration also includes a [State](https://storm.apache.org/documentation/Trident-state) implementation for Storm's Micro-batching/Transactional API (Trident) that allows you to write to Hive from a micro-batch/transactional topology and supports exactly-once semantics for data persistence.
+Apache Storm 0.10.0 introduces both a Apache Storm Core API bolt implementation 
+that allows users to stream data from Apache Storm directly into hive. Apache Storm's Hive integration also includes a [State](https://storm.apache.org/documentation/Trident-state) implementation for Apache Storm's Micro-batching/Transactional API (Trident) that allows you to write to Hive from a micro-batch/transactional topology and supports exactly-once semantics for data persistence.
 
-For more information on Storm's Hive integration, see the [storm-hive documentation](https://github.com/apache/storm/blob/v0.10.0-beta/external/storm-hive/README.md).
+For more information on Apache Storm's Hive integration, see the [storm-hive documentation](https://github.com/apache/storm/blob/v0.10.0-beta/external/storm-hive/README.md).
 
 
 Microsoft Azure Event Hubs Integration
 --------------------------------------
-With Microsoft Azure's [support for running Storm on HDInsight](https://azure.microsoft.com/en-us/documentation/articles/hdinsight-storm-overview/), Storm is now a first class citizen of the Azure cloud computing platform. To better support Storm integration with Azure services, Microsoft engineers have contributed several components that allow Storm to integrate directly with [Microsoft Azure Event Hubs](http://azure.microsoft.com/en-us/services/event-hubs/).
+With Microsoft Azure's [support for running Apache Storm on HDInsight](https://azure.microsoft.com/en-us/documentation/articles/hdinsight-storm-overview/), Apache Storm is now a first class citizen of the Azure cloud computing platform. To better support Apache Storm integration with Azure services, Microsoft engineers have contributed several components that allow Apache Storm to integrate directly with [Microsoft Azure Event Hubs](http://azure.microsoft.com/en-us/services/event-hubs/).
 
-Storm's Event Hubs integration includes both spout and bolt implementations for reading from, and writing to Event Hubs. The Event Hub integration also includes a Micro-batching/Transactional (Trident) spout implementation that supports fully fault-tolerant and reliable processing, as well as support for exactly-once message processing semantics.
+Apache Storm's Event Hubs integration includes both spout and bolt implementations for reading from, and writing to Event Hubs. The Event Hub integration also includes a Micro-batching/Transactional (Trident) spout implementation that supports fully fault-tolerant and reliable processing, as well as support for exactly-once message processing semantics.
 
 
 Redis Support
 -------------
-Apache Storm 0.10.0 also introduces support for the [Redis](http://redis.io) data structure server. Storm's Redis support includes bolt implementations for both writing to and querying Redis from a Storm topology, and is easily extended for custom use cases. For Storm's micro-batching/transactional API, the Redis support includes both [Trident State and MapState](https://storm.apache.org/documentation/Trident-state.html) implementations for fault-tolerant state management with Redis.
+Apache Storm 0.10.0 also introduces support for the [Redis](http://redis.io) data structure server. Apache Storm's Redis support includes bolt implementations for both writing to and querying Redis from a Apache Storm topology, and is easily extended for custom use cases. For Apache Storm's micro-batching/transactional API, the Redis support includes both [Trident State and MapState](https://storm.apache.org/documentation/Trident-state.html) implementations for fault-tolerant state management with Redis.
 
 Further information can be found in the [storm-redis documentation](https://github.com/apache/storm/blob/v0.10.0-beta/external/storm-redis/README.md).
 
 
 JDBC/RDBMS Integration
 ----------------------
-Many stream processing data flows require accessing data from or writing data to a relational data store. Storm 0.10.0 introduces highly flexible and customizable support for integrating with virtually any JDBC-compliant database.
+Many stream processing data flows require accessing data from or writing data to a relational data store. Apache Storm 0.10.0 introduces highly flexible and customizable support for integrating with virtually any JDBC-compliant database.
 
-The Storm-JDBC package includes core Storm bolt and Trident state implementations that allow a storm topology to either insert Storm tuple data into a database table or execute select queries against a database to enrich streaming data in a storm topology.
+The Storm-JDBC package includes core Apache Storm bolt and Trident state implementations that allow an Apache Storm topology to either insert Apache Storm tuple data into a database table or execute select queries against a database to enrich streaming data in an Apache Storm topology.
 
 Further details and instructions can be found in the [Storm-JDBC documentation](https://github.com/apache/storm/blob/v0.10.0-beta/external/storm-jdbc/README.md).
 
 
 Reduced Dependency Conflicts
 ----------------------------
-In previous Storm releases, it was not uncommon for users' topology dependencies to conflict with the libraries used by Storm. In Storm 0.9.3 several dependency packages that were common sources of conflicts have been package-relocated (shaded) to avoid this situation. In 0.10.0 this list has been expanded.
+In previous Apache Storm releases, it was not uncommon for users' topology dependencies to conflict with the libraries used by Apache Storm. In Apache Storm 0.9.3 several dependency packages that were common sources of conflicts have been package-relocated (shaded) to avoid this situation. In 0.10.0 this list has been expanded.
 
 Developers are free to use the Storm-packaged versions, or supply their own version. 
 
-The full list of Storm's package relocations can be found [here](https://github.com/apache/storm/blob/v0.10.0-beta/storm-core/pom.xml#L439).
+The full list of Apache Storm's package relocations can be found [here](https://github.com/apache/storm/blob/v0.10.0-beta/storm-core/pom.xml#L439).
 
 
 Future Work
 -----------
-While the 0.10.0 release is an important milestone in the evolution of Apache Storm, the Storm community is actively working on new improvements, both near and long term, and continuously exploring the realm of the possible.
+While the 0.10.0 release is an important milestone in the evolution of Apache Storm, the Apache Storm community is actively working on new improvements, both near and long term, and continuously exploring the realm of the possible.
 
-Twitter recently announced the Heron project, which claims to provide substantial performance improvements while maintaining 100% API compatibility with Storm. The corresponding research paper provides additional details regarding the architectural improvements. The fact that Twitter chose to maintain API compatibility with Storm is a testament to the power and flexibility of that API. Twitter has also expressed a desire to share their experiences and work with the Apache Storm community.
+Twitter recently announced the Heron project, which claims to provide substantial performance improvements while maintaining 100% API compatibility with Apache Storm. The corresponding research paper provides additional details regarding the architectural improvements. The fact that Twitter chose to maintain API compatibility with Apache Storm is a testament to the power and flexibility of that API. Twitter has also expressed a desire to share their experiences and work with the Apache Storm community.
 
-A number of concepts expressed in the Heron paper were already in the implementation stage by the Storm community even before it was published, and we look forward to working with Twitter to bring those and other improvements to Storm.
+A number of concepts expressed in the Heron paper were already in the implementation stage by the Apache Storm community even before it was published, and we look forward to working with Twitter to bring those and other improvements to Apache Storm.
 
 Thanks
 ------
diff --git a/_posts/2015-11-05-storm0100-released.md b/_posts/2015-11-05-storm0100-released.md
index 2c42820..af3ea4c 100644
--- a/_posts/2015-11-05-storm0100-released.md
+++ b/_posts/2015-11-05-storm0100-released.md
@@ -1,6 +1,6 @@
 ---
 layout: post
-title: Storm 0.10.0 released
+title: Apache Storm 0.10.0 released
 author: P. Taylor Goetz
 ---
 
diff --git a/_posts/2015-11-05-storm096-released.md b/_posts/2015-11-05-storm096-released.md
index 62354e4..9407c31 100644
--- a/_posts/2015-11-05-storm096-released.md
+++ b/_posts/2015-11-05-storm096-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 0.9.6 released
+title: Apache Storm 0.9.6 released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 0.9.6 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2016-04-12-storm100-released.md b/_posts/2016-04-12-storm100-released.md
index 232902e..6e648d8 100644
--- a/_posts/2016-04-12-storm100-released.md
+++ b/_posts/2016-04-12-storm100-released.md
@@ -1,6 +1,6 @@
 ---
 layout: post
-title: Storm 1.0.0 released
+title: Apache Storm 1.0.0 released
 author: P. Taylor Goetz
 ---
 
@@ -16,7 +16,7 @@
 Pacemaker - Heartbeat Server
 ----------------------------
 
-Pacemaker is an optional Storm daemon designed to process heartbeats from workers. As Storm is scaled up, ZooKeeper begins to become a bottleneck due to high volumes of writes from workers doing heartbeats. Lots of writes to disk and large ammounts traffic across the network is generated as ZooKeeper tries to maintain consistency.
+Pacemaker is an optional Apache Storm daemon designed to process heartbeats from workers. As Apache Storm is scaled up, ZooKeeper begins to become a bottleneck due to high volumes of writes from workers doing heartbeats. Lots of writes to disk and large ammounts traffic across the network is generated as ZooKeeper tries to maintain consistency.
 
 Because heartbeats are of an ephemeral nature, they do not need to be persisted to disk or synced across nodes, and an in-memory store will do. This is the role of Pacemaker. Pacemaker functions as a simple in-memory key/value store with ZooKeeper-like, directory-style keys and byte array values.
 
@@ -25,15 +25,15 @@
 ---------------------
 In the past it was common for developers to bundle resources required by a topology (such as lookup data, machine learning models, etc.) within a topology jar file. One problem with this approach is that updating that data required the repackaging and redeployment of the topology. Another problem is that at times that data can be very large (gigabytes or more), which negatively impacts topology startup time. 
 
-Storm version 1.0 introduces a distributed cache API that allows for the sharing of files (BLOBs) among topologies. Files in the distributed cache can be updated at any time from the command line, without the need to redeploy a topology. The distributed cache API allows for files from several KB in size to several GB, and also supports compression formats such as ZIP and GZIP.
+Apache Storm version 1.0 introduces a distributed cache API that allows for the sharing of files (BLOBs) among topologies. Files in the distributed cache can be updated at any time from the command line, without the need to redeploy a topology. The distributed cache API allows for files from several KB in size to several GB, and also supports compression formats such as ZIP and GZIP.
 
-Storm 1.0 comes with two implementations of the distributed cache API: One backed by the local file system on Supervisor nodes, and one backed by Apache Hadoop HDFS. Both implementations also support fine-grained access control through ACLs.
+Apache Storm 1.0 comes with two implementations of the distributed cache API: One backed by the local file system on Supervisor nodes, and one backed by Apache Hadoop HDFS. Both implementations also support fine-grained access control through ACLs.
 
 HA Nimbus
 ---------
-Experienced Storm users will recognize that the Storm Nimbus service is not a single point of failure in the strictest sense (i.e. loss of the Nimbus node will not affect running topologies). However, the loss of the Nimbus node does degrade functionality for deploying new topologies and reassigning work across a cluster.
+Experienced Apache Storm users will recognize that the Apache Storm Nimbus service is not a single point of failure in the strictest sense (i.e. loss of the Nimbus node will not affect running topologies). However, the loss of the Nimbus node does degrade functionality for deploying new topologies and reassigning work across a cluster.
 
-In Storm 1.0 this “soft” point of failure has been eliminated by supporting an HA Nimbus. Multiple instances of the Nimbus service run in a cluster and perform leader election when a Nimbus node fails, and Nimbus hosts can join or leave the cluster at any time. HA Nimbus leverages the distributed cache API for replication to guarantee the availability of topology resources in the event of a Nimbus node failure.
+In Apache Storm 1.0 this “soft” point of failure has been eliminated by supporting an HA Nimbus. Multiple instances of the Nimbus service run in a cluster and perform leader election when a Nimbus node fails, and Nimbus hosts can join or leave the cluster at any time. HA Nimbus leverages the distributed cache API for replication to guarantee the availability of topology resources in the event of a Nimbus node failure.
 
 
 Native Streaming Window API
@@ -43,63 +43,63 @@
 
 Windowing is primarily used for aggregations, joins, pattern matching and more. Windows can be seen as an in-memory table where events are added and evicted based on some policies.
 
-In past releases Storm relied on developers to build their own windowing logic. There were no recommended or high level abstractions that developers could use to define a Window in a standard way in a Topology.
+In past releases Apache Storm relied on developers to build their own windowing logic. There were no recommended or high level abstractions that developers could use to define a Window in a standard way in a Topology.
 
 Apache Storm 1.0 now includes a native windowing API. Windows can be specified with the following two parameters,
 
 1. Window length - the length or duration of the window
 2. Sliding interval - the interval at which the window slides
 
-Storm has support for sliding and tumbling windows based on time duration and/or event count.
+Apache Storm has support for sliding and tumbling windows based on time duration and/or event count.
 
 
 State Management - Statefule Bolts with Automatic Checkpointing
 ----------------
-Storm 1.0 introduces a new Stateful Bolt API with automatic checkpointing. Stateful Bolts are easy to implement -- simply extend the `BaseStatefulBolt` class -- and can be combined with stateless bolts in a topology. Storm will automatically manage bolt state and recover that state in the event of a failure.
+Apache Storm 1.0 introduces a new Stateful Bolt API with automatic checkpointing. Stateful Bolts are easy to implement -- simply extend the `BaseStatefulBolt` class -- and can be combined with stateless bolts in a topology. Apache Storm will automatically manage bolt state and recover that state in the event of a failure.
 
-Storm 1.0 comes with a state implementations backed by memory as well as Redis. Future point releases will include additional support for alternative state stores.
+Apache Storm 1.0 comes with a state implementations backed by memory as well as Redis. Future point releases will include additional support for alternative state stores.
 
 Automatic Backpressure
 ----------------------
-In previous Storm versions, the only way to throttle the input to a topology was to enable ACKing and set `topology.max.spout.pending`. For use cases that don't require at-least-once processing guarantees, this requirement imposed a significant performance penalty.
+In previous Apache Storm versions, the only way to throttle the input to a topology was to enable ACKing and set `topology.max.spout.pending`. For use cases that don't require at-least-once processing guarantees, this requirement imposed a significant performance penalty.
 
-Storm 1.0 includes a new automatic backpressure mechanism based on configurable high/low watermarks expressed as a percentage of a task's buffer size. If the high water mark is reached, Storm will slow down the topology's spouts and stop throttling when the low water mark is reached.
+Apache Storm 1.0 includes a new automatic backpressure mechanism based on configurable high/low watermarks expressed as a percentage of a task's buffer size. If the high water mark is reached, Apache Storm will slow down the topology's spouts and stop throttling when the low water mark is reached.
 
-Storm's backpressure mechanism is implemented independently of the Spout API, so all existing Spouts are supported.
+Apache Storm's backpressure mechanism is implemented independently of the Spout API, so all existing Spouts are supported.
 
 Resource Aware Scheduler
 ------------------------
 
-Based on Storm pluggable topology scheduler API, Storm 1.0 adds a new scheduler implementation that takes into account both the memory (on-heap and off-heap) and CPU resources available in a cluster. The resources aware scheduler (AKA "RAS Scheduler") allows users to specify the memory and CPU requirements for individual topology components (Spouts/Bolts), and Storm will schedule topology tasks among workers to best meet those requirements.
+Based on Apache Storm pluggable topology scheduler API, Apache Storm 1.0 adds a new scheduler implementation that takes into account both the memory (on-heap and off-heap) and CPU resources available in a cluster. The resources aware scheduler (AKA "RAS Scheduler") allows users to specify the memory and CPU requirements for individual topology components (Spouts/Bolts), and Apache Storm will schedule topology tasks among workers to best meet those requirements.
 
-In the future, the Storm community plans to extend the RAS implmentation to support network resources and rack awareness as well.
+In the future, the Apache Storm community plans to extend the RAS implmentation to support network resources and rack awareness as well.
 
 Dynamic Log Levels
 ------------------
 
-Storm 1.0 now allows users and administrators to dynamically change the log level settings for a running topology both from the Storm UI as well as the command line. Users can also specify an optional timeout after which those changes will be automatically reverted. The resulting log files are also easily searchable from the Storm UI and logviewer service.
+Apache Storm 1.0 now allows users and administrators to dynamically change the log level settings for a running topology both from the Apache Storm UI as well as the command line. Users can also specify an optional timeout after which those changes will be automatically reverted. The resulting log files are also easily searchable from the Apache Storm UI and logviewer service.
 
 
 Tuple Sampling and Debugging
 ----------------------------
 
-In the course of debugging a topology, many Storm users find themselves adding "debug" bolts or Trident functions to log information about the data flowing through the topology, only to remove or disable them for production deployment. Storm 1.0 eliminates this need through the new Topology Debug capability.
+In the course of debugging a topology, many Apache Storm users find themselves adding "debug" bolts or Trident functions to log information about the data flowing through the topology, only to remove or disable them for production deployment. Apache Storm 1.0 eliminates this need through the new Topology Debug capability.
 
-Storm UI now includes a function that allow you to sample a percentage tuples flowing through a topology or individual component directly from the Storm UI. The sampled events can then be viewed directly from the Storm UI and are also saved to disk.
+Apache Storm UI now includes a function that allow you to sample a percentage tuples flowing through a topology or individual component directly from the Apache Storm UI. The sampled events can then be viewed directly from the Apache Storm UI and are also saved to disk.
 
 Distributed Log Search
 ----------------------
-Another improvement to Storm's UI is the addition of a distributed log search. This search capability allows users to search across all log files of a specific topology, including archived (ZIP'ed) logs. The search results will include matches from all Supervisor nodes.
+Another improvement to Apache Storm's UI is the addition of a distributed log search. This search capability allows users to search across all log files of a specific topology, including archived (ZIP'ed) logs. The search results will include matches from all Supervisor nodes.
 
 Dynamic Worker Profiling
 ------------------------
-The last, but certainly not the least, usability improvement in Storm 1.0 is dynamic worker profiling. This new feature allows users to request worker profile data directly from Storm UI, including:
+The last, but certainly not the least, usability improvement in Apache Storm 1.0 is dynamic worker profiling. This new feature allows users to request worker profile data directly from Apache Storm UI, including:
 
  * Heap Dumps
  * JStack Output
  * JProfile Recordings
  
-The generated files are then available for download for off-line analysis with various debugging tools. It is also now possible to restart workers from the Storm UI.
+The generated files are then available for download for off-line analysis with various debugging tools. It is also now possible to restart workers from the Apache Storm UI.
 
 
 Thanks
diff --git a/_posts/2016-05-05-storm0101-released.md b/_posts/2016-05-05-storm0101-released.md
index 465b1b2..180b622 100644
--- a/_posts/2016-05-05-storm0101-released.md
+++ b/_posts/2016-05-05-storm0101-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 0.10.1 Released
+title: Apache Storm 0.10.1 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 0.10.1 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2016-05-06-storm101-released.md b/_posts/2016-05-06-storm101-released.md
index 1631e3f..813d7f2 100644
--- a/_posts/2016-05-06-storm101-released.md
+++ b/_posts/2016-05-06-storm101-released.md
@@ -1,17 +1,17 @@
 ---
 layout: post
-title: Storm 1.0.1 Released
+title: Apache Storm 1.0.1 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.0.1 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Performance Improvements
 ------------------------
-This release includes performance improvements to Storm's internal messaging system. The maximum rate at which spouts can emit data has nearly doubled, and performance of inter-task communication has improved.
+This release includes performance improvements to Apache Storm's internal messaging system. The maximum rate at which spouts can emit data has nearly doubled, and performance of inter-task communication has improved.
 
 
 Thanks
diff --git a/_posts/2016-08-10-storm102-released.md b/_posts/2016-08-10-storm102-released.md
index f93fd33..d90f983 100644
--- a/_posts/2016-08-10-storm102-released.md
+++ b/_posts/2016-08-10-storm102-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 1.0.2 Released
+title: Apache Storm 1.0.2 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.0.2 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2016-09-07-storm097-released.md b/_posts/2016-09-07-storm097-released.md
index d5bfa9c..496b8f2 100644
--- a/_posts/2016-09-07-storm097-released.md
+++ b/_posts/2016-09-07-storm097-released.md
@@ -1,17 +1,17 @@
 ---
 layout: post
-title: Storm 0.9.7 Released
+title: Apache Storm 0.9.7 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 0.9.7 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Multi-Lang Bug Fix
 ------------------
-This release fixes an issue with Storm's multi-lang feature where a malformed multi-lang message from a ShellSpout would cause the spout to hang indefinitely.
+This release fixes an issue with Apache Storm's multi-lang feature where a malformed multi-lang message from a ShellSpout would cause the spout to hang indefinitely.
 
 
 Thanks
diff --git a/_posts/2016-09-14-storm0102-released.md b/_posts/2016-09-14-storm0102-released.md
index e1fb0fa..e3c4ec8 100644
--- a/_posts/2016-09-14-storm0102-released.md
+++ b/_posts/2016-09-14-storm0102-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 0.10.2 Released
+title: Apache Storm 0.10.2 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 0.10.2 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2017-02-14-storm103-released.md b/_posts/2017-02-14-storm103-released.md
index 0d590ea..dfe5466 100644
--- a/_posts/2017-02-14-storm103-released.md
+++ b/_posts/2017-02-14-storm103-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 1.0.3 Released
+title: Apache Storm 1.0.3 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.0.3 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2017-03-29-storm110-released.md b/_posts/2017-03-29-storm110-released.md
index 22b7cd3..06130e3 100644
--- a/_posts/2017-03-29-storm110-released.md
+++ b/_posts/2017-03-29-storm110-released.md
@@ -1,6 +1,6 @@
 ---
 layout: post
-title: Storm 1.1.0 released
+title: Apache Storm 1.1.0 released
 author: P. Taylor Goetz
 ---
 
@@ -10,9 +10,9 @@
 
 Streaming SQL
 -------------
-Storm 1.1.0 supports native Streaming SQL, powered by [Apache Calcite](http://calcite.apache.org), that allows users to run SQL queries over streaming data as well update external systems and data stores such as [Apache Hive](http://hive.apache.org). To deploy an SQL-based topology users define the SQL query in a text file and use the `storm sql` command to submit the resulting topology to a Storm cluster. Behind the scenes Storm will compile the SQL into a Trident topology and run it on the cluster.
+Apache Storm 1.1.0 supports native Streaming SQL, powered by [Apache Calcite](http://calcite.apache.org), that allows users to run SQL queries over streaming data as well update external systems and data stores such as [Apache Hive](http://hive.apache.org). To deploy an SQL-based topology users define the SQL query in a text file and use the `storm sql` command to submit the resulting topology to an Apache Storm cluster. Behind the scenes Apache Storm will compile the SQL into a Trident topology and run it on the cluster.
 
-Storm's SQL support includes the following features:
+Apache Storm's SQL support includes the following features:
 
  * Streaming from/to external sources including Apache Kafka, HDFS, MongoDB, and Redis
  * Tuple filtering
@@ -22,7 +22,7 @@
  * CSV, TSV, and Avro input/output formats
  * Extensibility to additional data sources via the `ISqlTridentDataSource` interface
 
-For more information about Storm's SQL support including examples, refer to the following resources:
+For more information about Apache Storm's SQL support including examples, refer to the following resources:
 
  * [Storm SQL Overview](/releases/1.1.0/storm-sql.html)
  * [Storm SQL Examples](/releases/1.1.0/storm-sql-example.html)
@@ -30,7 +30,7 @@
 
 Apache Kafka Integration Improvements
 -------------------------------------
-In addition to the traditional support for Kafka version 0.8/0.9 based on the Kafka simple consumer, Storm includes support for Kafka 0.10 and later based on the new Kafka consumer API. Storm's integration with Kafka 0.10 and later version is highly flexible and extensible, some of the features include:
+In addition to the traditional support for Kafka version 0.8/0.9 based on the Kafka simple consumer, Apache Storm includes support for Kafka 0.10 and later based on the new Kafka consumer API. Apache Storm's integration with Kafka 0.10 and later version is highly flexible and extensible, some of the features include:
 
  * Enhanced configuration API
  * Fine-grained offset control (at start and after failure)
@@ -41,7 +41,7 @@
  * Manual partition control
  * Kafka security support
 
-For more information on Storm's Kafka integration please refer to the following documentation:
+For more information on Apache Storm's Kafka integration please refer to the following documentation:
 
  * [Kafka Integration (0.10 and later)](/releases/1.1.0/storm-kafka-client.html)
  * [Kafka Integration (0.8/0.9)](/releases/1.1.0/storm-kafka.html)
@@ -49,41 +49,41 @@
 
 PMML (Predictive Model Markup Language) Support
 ------------
-In order to better support machine learning use cases, Storm now includes support for executing PMML models in topoliges via a generic PMML bolt. The `PMMLPredictorBolt` allows users to specify a model, the raw input, and the resulting streams and output fields. At runtime the bolt will process incoming raw data, execute the model with the given input, and output tuples with scores for predicted fields and output fields.
+In order to better support machine learning use cases, Apache Storm now includes support for executing PMML models in topoliges via a generic PMML bolt. The `PMMLPredictorBolt` allows users to specify a model, the raw input, and the resulting streams and output fields. At runtime the bolt will process incoming raw data, execute the model with the given input, and output tuples with scores for predicted fields and output fields.
 
-More information on Storm's PMML support can be found [here](https://github.com/apache/storm/blob/v1.1.0/external/storm-pmml/README.md).
+More information on Apache Storm's PMML support can be found [here](https://github.com/apache/storm/blob/v1.1.0/external/storm-pmml/README.md).
 
 
 Druid Integration
 -----------------
-[Druid](http://druid.io) is a scalable, high-performance, column oriented, distributed data store popular for real time analytics use cases. Storm 1.1.0 introduces a Storm bolt and Trident state implementations for streaming data into a Druid data store.
+[Druid](http://druid.io) is a scalable, high-performance, column oriented, distributed data store popular for real time analytics use cases. Apache Storm 1.1.0 introduces a Apache Storm bolt and Trident state implementations for streaming data into a Druid data store.
 
-Documentation for Storm's Druid integration can be found [here](https://github.com/apache/storm/blob/v1.1.0/external/storm-druid/README.md).
+Documentation for Apache Storm's Druid integration can be found [here](https://github.com/apache/storm/blob/v1.1.0/external/storm-druid/README.md).
 
 
 OpenTSDB Integration
 --------------------
-[OpenTSDB](http://opentsdb.net) is a highly scalable time series database based on Apache HBase. Storm 1.1.0 adds a Storm bolt and Trident state implementations for writing data to OpenTSDB. Storm's OpenTSDB integration gives users fine-grained control over how Storm tuples map to OpenTSDB data structure by providing a simple interface (`ITupleOpenTsdbDatapointMapper`) that performs the translation.
+[OpenTSDB](http://opentsdb.net) is a highly scalable time series database based on Apache HBase. Apache Storm 1.1.0 adds an Apache Storm bolt and Trident state implementations for writing data to OpenTSDB. Apache Storm's OpenTSDB integration gives users fine-grained control over how Apache Storm tuples map to OpenTSDB data structure by providing a simple interface (`ITupleOpenTsdbDatapointMapper`) that performs the translation.
 
-Move information about Storm's OpenTSDB integration can be found [here](https://github.com/apache/storm/blob/v1.1.0/external/storm-opentsdb/README.md).
+Move information about Apache Storm's OpenTSDB integration can be found [here](https://github.com/apache/storm/blob/v1.1.0/external/storm-opentsdb/README.md).
 
 AWS Kinesis Support
 -------------------
-For users looking to integrate with Amazon's Kinesis service, Storm 1.1.0 now includes a spout for consuming message streams from Kinesis. Like most of Storm's external system integration components, the Kinesis spout provides a simple interface (`RecordToTupleMapper`)for controlling how Kinesis messages are translated to Storm tuples. The Kinesis spout provides an additional interface (`FailedMessageRetryHandler`) that allows users to customize the Spout's failure handling logic.
+For users looking to integrate with Amazon's Kinesis service, Apache Storm 1.1.0 now includes a spout for consuming message streams from Kinesis. Like most of Apache Storm's external system integration components, the Kinesis spout provides a simple interface (`RecordToTupleMapper`)for controlling how Kinesis messages are translated to Apache Storm tuples. The Kinesis spout provides an additional interface (`FailedMessageRetryHandler`) that allows users to customize the Spout's failure handling logic.
 
 Documentation for the Kinesis spout can be found [here](https://github.com/apache/storm/blob/v1.1.0/external/storm-kinesis/README.md).
 
 
 HDFS Spout
 ----------
-Storm's HDFS integration now includes a spout that continuously streams data from the HDFS filesystem. Storm's HDFS spout monitors a configurable directory for new files and feeds that data into a topology. When the spout has completed processing a file, it will be moved to the configured archive directory. In the event a file is corrupt or is otherwise not processable, the corresponding file will be moved to a specific directory. Parallelism of the spout is made possible through a locking mechanism that ensures each file is "owned" by a single spout instance. The HDFS spout supports connecting to HDFS instances that are secured with Kerberos authentication.
+Apache Storm's HDFS integration now includes a spout that continuously streams data from the HDFS filesystem. Apache Storm's HDFS spout monitors a configurable directory for new files and feeds that data into a topology. When the spout has completed processing a file, it will be moved to the configured archive directory. In the event a file is corrupt or is otherwise not processable, the corresponding file will be moved to a specific directory. Parallelism of the spout is made possible through a locking mechanism that ensures each file is "owned" by a single spout instance. The HDFS spout supports connecting to HDFS instances that are secured with Kerberos authentication.
 
-More information on using the HDFS spout can be found in the [Storm HDFS Documentation](https://github.com/apache/storm/blob/v1.1.0/external/storm-hdfs/README.md)
+More information on using the HDFS spout can be found in the [Apache Storm HDFS Documentation](https://github.com/apache/storm/blob/v1.1.0/external/storm-hdfs/README.md)
 
 
 Flux Improvements
 -----------------
-Flux is a framework and set of utilities that allow users to declaratively define Storm topologies and avoid hard-coding configuration values in topology components. Storm 1.1.0 introduces the following enhancements to the Flux framework:
+Flux is a framework and set of utilities that allow users to declaratively define Apache Storm topologies and avoid hard-coding configuration values in topology components. Apache Storm 1.1.0 introduces the following enhancements to the Flux framework:
 
  * Flux topology visualization in Storm UI
  * Support for Stateful bolts and windowing
@@ -95,14 +95,14 @@
 
 Topology Deployment Enhancements
 --------------------------------
-In previous versions of Storm it was typically necessary to include all topology dependences in a shaded "uber jar," or by making them available on Storm's classpath. In Storm 1.1.0 the `storm jar` command now includes options to upload additional dependency jars during topology submission. The `--jars` command line option allows users to specify local jar files to upload. Alternatively, the `storm jar` command offers the `--artifacts` option for specifying additional jar file dependencies by their Maven coordinates. Finally, for Maven artifacts outside the Maven Central, the `--artifactRepository` option allows users to specify additional repositories for dependency resolution.
+In previous versions of Apache Storm it was typically necessary to include all topology dependences in a shaded "uber jar," or by making them available on Apache Storm's classpath. In Apache Storm 1.1.0 the `storm jar` command now includes options to upload additional dependency jars during topology submission. The `--jars` command line option allows users to specify local jar files to upload. Alternatively, the `storm jar` command offers the `--artifacts` option for specifying additional jar file dependencies by their Maven coordinates. Finally, for Maven artifacts outside the Maven Central, the `--artifactRepository` option allows users to specify additional repositories for dependency resolution.
 
 More informaton about available options of the `storm jar` command can be found by runnng the `storm help jar` command.
 
 
 Resource Aware Scheduler (RAS) Improvements
 -------------------------------------------
-The Resource Aware Scheduler introduced in Storm 1.0 added a scheduler implementation that takes into account both the memory (on-heap and off-heap) and CPU resources available in a cluster. In Storm 1.1.0 the RAS algorithm has been overhauled to dramatically improve cluster resource utilization and introduces rack awareness into the scheduling strategy.
+The Resource Aware Scheduler introduced in Apache Storm 1.0 added a scheduler implementation that takes into account both the memory (on-heap and off-heap) and CPU resources available in a cluster. In Apache Storm 1.1.0 the RAS algorithm has been overhauled to dramatically improve cluster resource utilization and introduces rack awareness into the scheduling strategy.
 
 More information on the new RAS capabilities can be found in the [RAS documentation](/releases/1.1.0/Resource_Aware_Scheduler_overview.html) and the [JIRA ticket](https://issues.apache.org/jira/browse/STORM-1766) introducing the new rack awareness algorithm.
 
diff --git a/_posts/2017-07-28-storm104-released.md b/_posts/2017-07-28-storm104-released.md
index bdc0795..e698e5a 100644
--- a/_posts/2017-07-28-storm104-released.md
+++ b/_posts/2017-07-28-storm104-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 1.0.4 Released
+title: Apache Storm 1.0.4 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.0.4 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2017-08-01-storm111-released.md b/_posts/2017-08-01-storm111-released.md
index c31efdd..0757ab5 100644
--- a/_posts/2017-08-01-storm111-released.md
+++ b/_posts/2017-08-01-storm111-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 1.1.1 Released
+title: Apache Storm 1.1.1 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.1.1 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2017-09-15-storm105-released.md b/_posts/2017-09-15-storm105-released.md
index 204ef9b..f1c9c8f 100644
--- a/_posts/2017-09-15-storm105-released.md
+++ b/_posts/2017-09-15-storm105-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 1.0.5 Released
+title: Apache Storm 1.0.5 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.0.5 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2018-02-14-storm106-released.md b/_posts/2018-02-14-storm106-released.md
index bc18712..a8206ff 100644
--- a/_posts/2018-02-14-storm106-released.md
+++ b/_posts/2018-02-14-storm106-released.md
@@ -1,16 +1,16 @@
 ---
 layout: post
-title: Storm 1.0.6 Released
+title: Apache Storm 1.0.6 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.0.5 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 Apache Kafka Integration Improvements
 ------------------------------
-This release includes many improvements to Storm's Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
+This release includes many improvements to Apache Storm's Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
 [Kafka client documentation](/releases/1.0.6/storm-kafka-client.html)
 
 
diff --git a/_posts/2018-02-15-storm112-released.md b/_posts/2018-02-15-storm112-released.md
index 79d83c7..0e60bcb 100644
--- a/_posts/2018-02-15-storm112-released.md
+++ b/_posts/2018-02-15-storm112-released.md
@@ -1,16 +1,16 @@
 ---
 layout: post
-title: Storm 1.1.2 Released
+title: Apache Storm 1.1.2 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.1.2 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 Apache Kafka Integration Improvements
 ------------------------------
-This release includes many improvements to Storm's Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
+This release includes many improvements to Apache Storm's Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
 [Kafka client documentation](/releases/1.1.2/storm-kafka-client.html)
 
 
diff --git a/_posts/2018-02-15-storm120-released.md b/_posts/2018-02-15-storm120-released.md
index 68282de..9fe500b 100644
--- a/_posts/2018-02-15-storm120-released.md
+++ b/_posts/2018-02-15-storm120-released.md
@@ -1,6 +1,6 @@
 ---
 layout: post
-title: Storm 1.2.0 Released
+title: Apache Storm 1.2.0 Released
 author: P. Taylor Goetz
 ---
 
@@ -9,12 +9,12 @@
 
 Apache Kafka Integration Improvements
 ------------------------------
-This release includes many improvements to Storm's Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
+This release includes many improvements to Apache Storm's Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
 [Kafka client documentation](/releases/1.2.0/storm-kafka-client.html)
 
 New Metrics Reporting API
 -------------------------
-This release introduces a new metrics system for reporting internal statistics (e.g. acked, failed, emitted, transferred, disruptor queue metrics, etc.) as well as a new API for user defined metrics based on the popular [Dropwizard Metrics library](). Storm includes reporters for gathering metrics data with Ganglia, Graphite, JMX, CSV and the console. Additional metrics systems can be integrated by extending the `org.apache.storm.metrics2.reporters.ScheduledStormReporter` class. Additional details can be found in the [metrics documentation](/releases/1.2.0/metrics_v2.html).
+This release introduces a new metrics system for reporting internal statistics (e.g. acked, failed, emitted, transferred, disruptor queue metrics, etc.) as well as a new API for user defined metrics based on the popular [Dropwizard Metrics library](). Apache Storm includes reporters for gathering metrics data with Ganglia, Graphite, JMX, CSV and the console. Additional metrics systems can be integrated by extending the `org.apache.storm.metrics2.reporters.ScheduledStormReporter` class. Additional details can be found in the [metrics documentation](/releases/1.2.0/metrics_v2.html).
 
 
 Thanks
diff --git a/_posts/2018-02-19-storm121-released.md b/_posts/2018-02-19-storm121-released.md
index e567f5b..69ea944 100644
--- a/_posts/2018-02-19-storm121-released.md
+++ b/_posts/2018-02-19-storm121-released.md
@@ -1,16 +1,16 @@
 ---
 layout: post
-title: Storm 1.2.1 Released
+title: Apache Storm 1.2.1 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.2.1 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 In the 1.2.0 release, an LGPL-licensed binary dependency was inadvertently included. The 1.2.0 has since been removed from distribution.
 
-The dependency in question (Remote Tea Runtime) is required when using the Ganglia reporter for the new metrics system. To enable the Ganglia reporter you will need to download the following [jar](http://central.maven.org/maven2/org/acplt/oncrpc/1.0.7/oncrpc-1.0.7.jar) and place it in the `lib` directory of the Storm installation.
+The dependency in question (Remote Tea Runtime) is required when using the Ganglia reporter for the new metrics system. To enable the Ganglia reporter you will need to download the following [jar](http://central.maven.org/maven2/org/acplt/oncrpc/1.0.7/oncrpc-1.0.7.jar) and place it in the `lib` directory of the Apache Storm installation.
 
 
 Thanks
diff --git a/_posts/2018-06-04-storm113-released.md b/_posts/2018-06-04-storm113-released.md
index d4d9970..3013cf1 100644
--- a/_posts/2018-06-04-storm113-released.md
+++ b/_posts/2018-06-04-storm113-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 1.1.3 Released
+title: Apache Storm 1.1.3 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.1.3 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2018-06-04-storm122-released.md b/_posts/2018-06-04-storm122-released.md
index 5dbfbd6..c9d04fa 100644
--- a/_posts/2018-06-04-storm122-released.md
+++ b/_posts/2018-06-04-storm122-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 1.2.2 Released
+title: Apache Storm 1.2.2 Released
 author: P. Taylor Goetz
 ---
 
 The Apache Storm community is pleased to announce that version 1.2.2 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/_posts/2019-05-30-storm200-released.md b/_posts/2019-05-30-storm200-released.md
index abbb110..06a4771 100644
--- a/_posts/2019-05-30-storm200-released.md
+++ b/_posts/2019-05-30-storm200-released.md
@@ -1,6 +1,6 @@
 ---
 layout: post
-title: Storm 2.0.0 Released
+title: Apache Storm 2.0.0 Released
 author: Apache Storm PMC
 ---
 
@@ -11,20 +11,20 @@
 The full list of changes in this release can be found [here](https://www.apache.org/dist/storm/apache-storm-2.0.0/RELEASE_NOTES.html).
 
 ## New Architecture Implemented in Java
-In previous releases a large part of Storm's core functionality was implemented in Clojure. Storm 2.0.0 has been rearchitected with it's core functionality implemented in pure Java. The new Java-based implementation has improved performance significantly, and made Storm's internal APIs more maintainable and extensible. While Storm's Clojure implementation served it well for many years, it was often cited as a barrier for entry to new contributors. Storm's codebase is now more accessible to developers who don't want to learn Clojure in order to contribute.
+In previous releases a large part of Apache Storm's core functionality was implemented in Clojure. Apache Storm 2.0.0 has been rearchitected with it's core functionality implemented in pure Java. The new Java-based implementation has improved performance significantly, and made Apache Storm's internal APIs more maintainable and extensible. While Apache Storm's Clojure implementation served it well for many years, it was often cited as a barrier for entry to new contributors. Apache Storm's codebase is now more accessible to developers who don't want to learn Clojure in order to contribute.
 
 ## New High Performance Core:
-Storm 2.0.0 introduces a new core featuring a leaner threading model, a blazing fast messaging subsystem and a lightweight back pressure model. It is designed to push boundaries on throughput, latency and energy consumption while maintaining backward compatibility. The design was motivated by the observation that existing hardware remains capable of much more than what the best streaming engines can deliver. Storm 2.0 is the first streaming engine to break the 1 microsecond latency barrier.
+Apache Storm 2.0.0 introduces a new core featuring a leaner threading model, a blazing fast messaging subsystem and a lightweight back pressure model. It is designed to push boundaries on throughput, latency and energy consumption while maintaining backward compatibility. The design was motivated by the observation that existing hardware remains capable of much more than what the best streaming engines can deliver. Apache Storm 2.0 is the first streaming engine to break the 1 microsecond latency barrier.
 
 ##New Streams API
 
-Storm 2.0.0 introduces a new typed API for expressing streaming computations more easily using functional style operations. It builds on top of the Storm's core spouts and bolt APIs and automatically fuses multiple operations together to optimize the pipeline.
+Apache Storm 2.0.0 introduces a new typed API for expressing streaming computations more easily using functional style operations. It builds on top of the Apache Storm's core spouts and bolt APIs and automatically fuses multiple operations together to optimize the pipeline.
 
 For more details and examples see the [Stream API documentation](https://github.com/apache/storm/blob/master/docs/Stream-API.md).
 
 ## Windowing Enhancements
 
-Storm 2.0.0's Windowing API can save/restore the window state to the configured state backend so that larger continuous windows can be supported. The window boundaries can now be accessed via the APIs.
+Apache Storm 2.0.0's Windowing API can save/restore the window state to the configured state backend so that larger continuous windows can be supported. The window boundaries can now be accessed via the APIs.
 
 For more details see [stateful windowing documentation](https://github.com/apache/storm/blob/master/docs/Windowing.md#stateful-windowing).
 
@@ -32,14 +32,14 @@
 ## Kafka Integration Changes
 
 ### Removal of Storm-Kafka
-The most significant change to Storm's Kafka integration since 1.x, is that storm-kafka has been removed. The module was deprecated a while back, due to Kafka's deprecation of the underlying client library. Users will have to move to the storm-kafka-client module, which uses Kafka's ´kafka-clients´ library for integration.
+The most significant change to Apache Storm's Kafka integration since 1.x, is that storm-kafka has been removed. The module was deprecated a while back, due to Kafka's deprecation of the underlying client library. Users will have to move to the storm-kafka-client module, which uses Kafka's ´kafka-clients´ library for integration.
 
-For the most part, the migration to storm-kafka-client is straightforward. The documentation for storm-kafka-client contains a helpful mapping between the old and new spout configurations. If you are using any of the storm-kafka spouts, you will need to migrate offset checkpoints to the new spout, to avoid the new spout starting from scratch on your partitions. Storm provides a helper tool to do this which can be found [here](https://github.com/apache/storm/tree/master/external/storm-kafka-migration).
+For the most part, the migration to storm-kafka-client is straightforward. The documentation for storm-kafka-client contains a helpful mapping between the old and new spout configurations. If you are using any of the storm-kafka spouts, you will need to migrate offset checkpoints to the new spout, to avoid the new spout starting from scratch on your partitions. Apache Storm provides a helper tool to do this which can be found [here](https://github.com/apache/storm/tree/master/external/storm-kafka-migration).
 
 When performing a migration, you should stop your topology, run the migration tool, then redeploy your topology with the storm-kafka-client spout.
 
 ### Move to Using the KafkaConsumer.assign API
-Storm-kafka-client in Storm 1.x allowed you to use Kafka's own mechanism to manage which spout tasks were responsible for which partitions. This mechanism was a poor fit for Storm, and was deprecated in 1.2.0. It has been [removed entirely in 2.0](https://issues.apache.org/jira/browse/STORM-2542).
+Storm-kafka-client in Apache Storm 1.x allowed you to use Kafka's own mechanism to manage which spout tasks were responsible for which partitions. This mechanism was a poor fit for Apache Storm, and was deprecated in 1.2.0. It has been [removed entirely in 2.0](https://issues.apache.org/jira/browse/STORM-2542).
 
 The storm-kafka-client Subscription interface has also been removed. It offered too limited control over the subscription behavior. It has been replaced with the TopicFilter and ManualPartitioner interfaces. Unless you were using a custom Subscription implementation, this will likely not
 affect you. If you were using a custom Subscription, [the storm-kafka-client documentation describes how to customize assignment](https://github.com/apache/storm/blob/master/docs/storm-kafka-client.md#manual-partition-assigment-advanced).
@@ -56,10 +56,10 @@
 With the release of 2.0.0 the 1.0.x version line will no longer be maintained. 1.0.x users are strongly encouraged to upgrade to a more recent release.
 
 ## Move to Java 8
-Java 7 support has been dropped, and Storm 2.0.0 requires Java 8.
+Java 7 support has been dropped, and Apache Storm 2.0.0 requires Java 8.
 
-## Reorganization of Storm Maven artifacts
-The storm-core artifact has [been split](https://issues.apache.org/jira/browse/STORM-2441) into client and server-facing parts. Topology jars should depend on the following artifact as of Storm 2.0.0:
+## Reorganization of Apache Storm Maven artifacts
+The storm-core artifact has [been split](https://issues.apache.org/jira/browse/STORM-2441) into client and server-facing parts. Topology jars should depend on the following artifact as of Apache Storm 2.0.0:
 
 ```
 <groupId>org.apache.storm</groupId>
@@ -68,7 +68,7 @@
 <scope>provided</scope>
 ```
 
-Projects using `LocalCluster` for testing will additionally need to depend on the Storm server jar:
+Projects using `LocalCluster` for testing will additionally need to depend on the Apache Storm server jar:
 
 ```
 <groupId>org.apache.storm</groupId>
@@ -78,7 +78,7 @@
 ```
 
 ## Stay Tuned
-Keep an eye on the Apache Storm blog for additional posts by Storm contributors for more in-depth discussions of new features in Storm 2.0.0 including:
+Keep an eye on the Apache Storm blog for additional posts by Apache Storm contributors for more in-depth discussions of new features in Apache Storm 2.0.0 including:
 
 * SQL enhancements
 * Metrics improvements
diff --git a/_posts/2019-07-18-storm123-released.md b/_posts/2019-07-18-storm123-released.md
index 4b87ed0..a0da40f 100644
--- a/_posts/2019-07-18-storm123-released.md
+++ b/_posts/2019-07-18-storm123-released.md
@@ -1,12 +1,12 @@
 ---
 layout: post
-title: Storm 1.2.3 Released
+title: Apache Storm 1.2.3 Released
 author: Stig Rohde Døssing
 ---
 
 The Apache Storm community is pleased to announce that version 1.2.3 has been released and is available from [the downloads page](/downloads.html).
 
-This is a maintenance release that includes a number of important bug fixes that improve Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
+This is a maintenance release that includes a number of important bug fixes that improve Apache Storm's performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.
 
 
 Thanks
diff --git a/about/deployment.md b/about/deployment.md
index 5ffad17..f907afa 100644
--- a/about/deployment.md
+++ b/about/deployment.md
@@ -3,6 +3,6 @@
 title: Easy to deploy and operate
 ---
 
-Storm clusters are easy to deploy, requiring a minimum of setup and configuration to get up and running. Storm's out of the box configurations are suitable for production. Read more about how to deploy a Storm cluster [here](/documentation/Setting-up-a-Storm-cluster.html).
+Apache Storm clusters are easy to deploy, requiring a minimum of setup and configuration to get up and running. Apache Storm's out of the box configurations are suitable for production. Read more about how to deploy an Apache Storm cluster [here](/documentation/Setting-up-a-Storm-cluster.html).
 
-Additionally, Storm is easy to operate once deployed. Storm has been designed to be [extremely robust](/about/fault-tolerant.html) – the cluster will just keep on running, month after month.
+Additionally, Apache Storm is easy to operate once deployed. Apache Storm has been designed to be [extremely robust](/about/fault-tolerant.html) – the cluster will just keep on running, month after month.
diff --git a/about/fault-tolerant.md b/about/fault-tolerant.md
index 057b372..c43f4bb 100644
--- a/about/fault-tolerant.md
+++ b/about/fault-tolerant.md
@@ -2,8 +2,8 @@
 layout: about
 ---
 
-Storm is fault-tolerant: when workers die, Storm will automatically restart them. If a node dies, the worker will be restarted on another node.
+Apache Storm is fault-tolerant: when workers die, Apache Storm will automatically restart them. If a node dies, the worker will be restarted on another node.
 
-The Storm daemons, Nimbus and the Supervisors, are designed to be stateless and fail-fast. So if they die, they will restart like nothing happened. This means you can *kill -9* the Storm daemons without affecting the health of the cluster or your topologies.
+The Apache Storm daemons, Nimbus and the Supervisors, are designed to be stateless and fail-fast. So if they die, they will restart like nothing happened. This means you can *kill -9* the Apache Storm daemons without affecting the health of the cluster or your topologies.
 
-Read more about Storm's fault-tolerance [on the manual](/documentation/Fault-tolerance.html).
\ No newline at end of file
+Read more about Apache Storm's fault-tolerance [on the manual](/documentation/Fault-tolerance.html).
\ No newline at end of file
diff --git a/about/free-and-open-source.md b/about/free-and-open-source.md
index ade6afa..5affe5c 100644
--- a/about/free-and-open-source.md
+++ b/about/free-and-open-source.md
@@ -5,11 +5,11 @@
 Apache Storm is a free and open source project licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 
-Storm has a large and growing ecosystem of libraries and tools to use in conjunction with Storm including everything from:
+Apache Storm has a large and growing ecosystem of libraries and tools to use in conjunction with Apache Storm including everything from:
 
 1. *Spouts*: These spouts integrate with queueing systems such as JMS, Kafka, Redis pub/sub, and more.
 2. *storm-state*: storm-state makes it easy to manage large amounts of in-memory state in your computations in a reliable by using a distributed filesystem for persistence
 3. *Database integrations*: There are helper bolts for integrating with various databases, such as MongoDB, RDBMS's, Cassandra, and more.
 4. Other miscellaneous utilities
 
-The [Storm documentation](/documentation.html) has links to notable Storm-related projects hosted outside of Apache.
\ No newline at end of file
+The [Apache Storm documentation](/documentation.html) has links to notable Apache Storm related projects hosted outside of Apache.
\ No newline at end of file
diff --git a/about/guarantees-data-processing.md b/about/guarantees-data-processing.md
index 3d6a0f3..6ad8def 100644
--- a/about/guarantees-data-processing.md
+++ b/about/guarantees-data-processing.md
@@ -2,9 +2,9 @@
 layout: about
 ---
 
-Storm guarantees every tuple will be fully processed. One of Storm's core mechanisms is the ability to track the lineage of a tuple as it makes its way through the topology in an extremely efficient way. Read more about how this works [here](/documentation/Guaranteeing-message-processing.html).
+Apache Storm guarantees every tuple will be fully processed. One of Apache Storm's core mechanisms is the ability to track the lineage of a tuple as it makes its way through the topology in an extremely efficient way. Read more about how this works [here](/documentation/Guaranteeing-message-processing.html).
 
-Storm's basic abstractions provide an at-least-once processing guarantee, the same guarantee you get when using a queueing system. Messages are only replayed when there are failures.
+Apache Storm's basic abstractions provide an at-least-once processing guarantee, the same guarantee you get when using a queueing system. Messages are only replayed when there are failures.
 
-Using [Trident](/documentation/Trident-tutorial.html), a higher level abstraction over Storm's basic abstractions, you can achieve exactly-once processing semantics.
+Using [Trident](/documentation/Trident-tutorial.html), a higher level abstraction over Apache Storm's basic abstractions, you can achieve exactly-once processing semantics.
 
diff --git a/about/integrates.md b/about/integrates.md
index 8071bdb..d0f633d 100644
--- a/about/integrates.md
+++ b/about/integrates.md
@@ -2,7 +2,7 @@
 layout: about
 ---
 
-Storm integrates with any queueing system and any database system. Storm's [spout](/apidocs/backtype/storm/spout/ISpout.html) abstraction makes it easy to integrate a new queuing system. Example queue integrations include:
+Apache Storm integrates with any queueing system and any database system. Apache Storm's [spout](/apidocs/backtype/storm/spout/ISpout.html) abstraction makes it easy to integrate a new queuing system. Example queue integrations include:
 
 1. [Kestrel](https://github.com/nathanmarz/storm-kestrel)
 2. [RabbitMQ / AMQP](https://github.com/Xorlev/storm-amqp-spout)
@@ -10,4 +10,4 @@
 4. [JMS](https://github.com/ptgoetz/storm-jms)
 5. [Amazon Kinesis](https://github.com/awslabs/kinesis-storm-spout)
 
-Likewise, integrating Storm with database systems is easy. Simply open a connection to your database and read/write like you normally would. Storm will handle the parallelization, partitioning, and retrying on failures when necessary.
\ No newline at end of file
+Likewise, integrating Apache Storm with database systems is easy. Simply open a connection to your database and read/write like you normally would. Apache Storm will handle the parallelization, partitioning, and retrying on failures when necessary.
\ No newline at end of file
diff --git a/about/multi-language.md b/about/multi-language.md
index 836bf03..53580f1 100644
--- a/about/multi-language.md
+++ b/about/multi-language.md
@@ -2,8 +2,8 @@
 layout: about
 ---
 
-Storm was designed from the ground up to be usable with any programming language. At the core of Storm is a [Thrift](http://thrift.apache.org/) [definition](https://github.com/apache/storm/blob/master/storm-core/src/storm.thrift) for defining and submitting topologies. Since Thrift can be used in any language, topologies can be defined and submitted from any language.
+Apache Storm was designed from the ground up to be usable with any programming language. At the core of Apache Storm is a [Thrift](http://thrift.apache.org/) [definition](https://github.com/apache/storm/blob/master/storm-core/src/storm.thrift) for defining and submitting topologies. Since Thrift can be used in any language, topologies can be defined and submitted from any language.
 
-Similarly, spouts and bolts can be defined in any language. Non-JVM spouts and bolts communicate to Storm over a [JSON-based protocol](/documentation/Multilang-protocol.html) over stdin/stdout. Adapters that implement this protocol exist for [Ruby](https://github.com/apache/storm/blob/master/storm-multilang/ruby/src/main/resources/resources/storm.rb), [Python](https://github.com/apache/storm/blob/master/storm-multilang/python/src/main/resources/resources/storm.py), [Javascript](https://github.com/apache/storm/blob/master/storm-multilang/javascript/src/main/resources/resources/storm.js), [Perl](https://github.com/dan-blanchard/io-storm).
+Similarly, spouts and bolts can be defined in any language. Non-JVM spouts and bolts communicate to Apache Storm over a [JSON-based protocol](/documentation/Multilang-protocol.html) over stdin/stdout. Adapters that implement this protocol exist for [Ruby](https://github.com/apache/storm/blob/master/storm-multilang/ruby/src/main/resources/resources/storm.rb), [Python](https://github.com/apache/storm/blob/master/storm-multilang/python/src/main/resources/resources/storm.py), [Javascript](https://github.com/apache/storm/blob/master/storm-multilang/javascript/src/main/resources/resources/storm.js), [Perl](https://github.com/dan-blanchard/io-storm).
 
 *storm-starter* has an [example topology](https://github.com/apache/storm/blob/master/examples/storm-starter/src/jvm/storm/starter/WordCountTopology.java) that implements one of the bolts in Python.
diff --git a/about/scalable.md b/about/scalable.md
index b487e52..14d7da3 100644
--- a/about/scalable.md
+++ b/about/scalable.md
@@ -2,9 +2,9 @@
 layout: about
 ---
 
-Storm topologies are inherently parallel and run across a cluster of machines. Different parts of the topology can be scaled individually by tweaking their parallelism. The "rebalance" command of the "storm" command line client can adjust the parallelism of running topologies on the fly. 
+Apache Storm topologies are inherently parallel and run across a cluster of machines. Different parts of the topology can be scaled individually by tweaking their parallelism. The "rebalance" command of the "storm" command line client can adjust the parallelism of running topologies on the fly. 
 
-Storm's inherent parallelism means it can process very high throughputs of messages with very low latency. Storm was benchmarked at processing **one million 100 byte messages per second per node** on hardware with the following specs:
+Apache Storm's inherent parallelism means it can process very high throughputs of messages with very low latency. Apache Storm was benchmarked at processing **one million 100 byte messages per second per node** on hardware with the following specs:
 
  * **Processor:** 2x Intel E5645@2.4Ghz 
  * **Memory:** 24 GB
diff --git a/about/simple-api.md b/about/simple-api.md
index 906d145..4ed8439 100644
--- a/about/simple-api.md
+++ b/about/simple-api.md
@@ -2,14 +2,14 @@
 layout: about
 ---
 
-Storm has a simple and easy to use API. When programming on Storm, you manipulate and transform streams of tuples, and a tuple is a named list of values. Tuples can contain objects of any type; if you want to use a type Storm doesn't know about it's [very easy](/releases/current/Serialization.html) to register a serializer for that type.
+Apache Storm has a simple and easy to use API. When programming on Apache Storm, you manipulate and transform streams of tuples, and a tuple is a named list of values. Tuples can contain objects of any type; if you want to use a type Apache Storm doesn't know about it's [very easy](/releases/current/Serialization.html) to register a serializer for that type.
 
-There are just three abstractions in Storm: spouts, bolts, and topologies. A **spout** is a source of streams in a computation. Typically a spout reads from a queueing broker such as Kestrel, RabbitMQ, or Kafka, but a spout can also generate its own stream or read from somewhere like the Twitter streaming API. Spout implementations already exist for most queueing systems.
+There are just three abstractions in Apache Storm: spouts, bolts, and topologies. A **spout** is a source of streams in a computation. Typically a spout reads from a queueing broker such as Kestrel, RabbitMQ, or Kafka, but a spout can also generate its own stream or read from somewhere like the Twitter streaming API. Spout implementations already exist for most queueing systems.
 
 A **bolt** processes any number of input streams and produces any number of new output streams. Most of the logic of a computation goes into bolts, such as functions, filters, streaming joins, streaming aggregations, talking to databases, and so on.
 
 A **topology** is a network of spouts and bolts, with each edge in the network representing a bolt subscribing to the output stream of some other spout or bolt. A topology is an arbitrarily complex multi-stage stream computation. Topologies run indefinitely when deployed.
 
-Storm has a "local mode" where a Storm cluster is simulated in-process. This is useful for development and testing. The "storm" command line client is used when ready to submit a topology for execution on an actual cluster.
+Apache Storm has a "local mode" where a Apache Storm cluster is simulated in-process. This is useful for development and testing. The "storm" command line client is used when ready to submit a topology for execution on an actual cluster.
 
-The [storm-starter](https://github.com/apache/storm/tree/master/examples/storm-starter) project contains example topologies for learning the basics of Storm. Learn more about how to use Storm by reading the [tutorial](/releases/current/Tutorial.html) and the [documentation](/releases/current/index.html).
+The [storm-starter](https://github.com/apache/storm/tree/master/examples/storm-starter) project contains example topologies for learning the basics of Apache Storm. Learn more about how to use Apache Storm by reading the [tutorial](/releases/current/Tutorial.html) and the [documentation](/releases/current/index.html).
diff --git a/content/2012/08/02/storm080-released.html b/content/2012/08/02/storm080-released.html
index 433a752..90bb51e 100644
--- a/content/2012/08/02/storm080-released.html
+++ b/content/2012/08/02/storm080-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.8.0 and Trident released</title>
+    <title>Apache Storm 0.8.0 and Trident released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.8.0 and Trident released
+                               Apache Storm 0.8.0 and Trident released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -230,9 +230,9 @@
                                 </div>
                             </div>
                         <div>
-                	        <p>I&#39;m happy to announce the release of Storm 0.8.0. This is a <em>huge</em> release. Thanks to everyone who tested out the dev release and helped find and fix issues. And thanks to everyone who contributed pull requests. There&#39;s one big new thing available in the release: Trident. You may have heard me hint about Trident before, and now it&#39;s finally public. </p>
+                	        <p>I&#39;m happy to announce the release of Apache Storm 0.8.0. This is a <em>huge</em> release. Thanks to everyone who tested out the dev release and helped find and fix issues. And thanks to everyone who contributed pull requests. There&#39;s one big new thing available in the release: Trident. You may have heard me hint about Trident before, and now it&#39;s finally public. </p>
 
-<p>Trident is a higher level abstraction for Storm. It allows you to seamlessly mix high throughput (millions of messages per second), stateful stream processing with low latency distributed querying. If you&#39;re familiar with high level batch processing tools like Pig or Cascading, the concepts of Trident will be very familiar - Trident has joins, aggregations, grouping, functions, and filters. In addition to these, Trident adds primitives for doing stateful, incremental processing on top of any database or persistence store. Trident has consistent, exactly-once semantics, so it is easy to reason about Trident topologies. Trident is bundled with Storm, and you can read documentation about it on <a href="https://github.com/apache/incubator-storm/wiki/Documentation">this page</a> (start with &quot;Trident tutorial&quot;).</p>
+<p>Trident is a higher level abstraction for Apache Storm. It allows you to seamlessly mix high throughput (millions of messages per second), stateful stream processing with low latency distributed querying. If you&#39;re familiar with high level batch processing tools like Pig or Cascading, the concepts of Trident will be very familiar - Trident has joins, aggregations, grouping, functions, and filters. In addition to these, Trident adds primitives for doing stateful, incremental processing on top of any database or persistence store. Trident has consistent, exactly-once semantics, so it is easy to reason about Trident topologies. Trident is bundled with Apache Storm, and you can read documentation about it on <a href="https://github.com/apache/incubator-storm/wiki/Documentation">this page</a> (start with &quot;Trident tutorial&quot;).</p>
 
 <p>Trident supersedes both LinearDRPCTopologyBuilder and transactional topologies, both of which will be deprecated soon and eventually removed from the codebase. </p>
 
@@ -240,7 +240,7 @@
 
 <h2 id="executors">Executors</h2>
 
-<p>Prior to Storm 0.8.0, a running topology consisted of some number of workers and some number of tasks that ran on those workers. In the old model, worker = process and task = thread. Storm 0.8.0 changes this model by introducing executors. In this model, a worker = process, an executor = thread, and one executor runs many tasks from the same spout/bolt. </p>
+<p>Prior to Apache Storm 0.8.0, a running topology consisted of some number of workers and some number of tasks that ran on those workers. In the old model, worker = process and task = thread. Apache Storm 0.8.0 changes this model by introducing executors. In this model, a worker = process, an executor = thread, and one executor runs many tasks from the same spout/bolt. </p>
 
 <p>The reason for the change is that the old model complected the semantics of the topology with its physical execution. For example, if you had a bolt with 4 tasks doing a fields grouping on some stream, in order to maintain the semantics of the fields grouping (that the same value always goes to the same task id for that bolt), the number of tasks for that bolt needs to be fixed for the lifetime of the topology, and since task = thread, the number of threads for that bolt is fixed for the lifetime of the topology. In the new model, the number of threads for a bolt is disassociated from the number of tasks, meaning you can change the number of threads for a spout/bolt dynamically without affecting semantics. Similarly, if you&#39;re keeping large amounts of state in your bolts, and you want to increase the parallelism of the bolt without having to repartition the state, you can do this with the new executors. </p>
 
@@ -264,7 +264,7 @@
 
 <h2 id="throughput-improvements">Throughput improvements</h2>
 
-<p>The internals of Storm have been rearchitected for extremely significant performance gains. I&#39;m seeing throughput increases of anywhere from 5-10x of what it was before. I&#39;ve benchmarked Storm at 1M tuples / sec / node on an internal Twitter cluster. </p>
+<p>The internals of Apache Storm have been rearchitected for extremely significant performance gains. I&#39;m seeing throughput increases of anywhere from 5-10x of what it was before. I&#39;ve benchmarked Apache Storm at 1M tuples / sec / node on an internal Twitter cluster. </p>
 
 <p>The key changes made were: </p>
 
@@ -280,23 +280,23 @@
 
 <p>These may require some tweaking to optimize your topologies, but most likely the default values will work fine for you out of the box. </p>
 
-<h2 id="decreased-zookeeper-load-increased-storm-ui-performance">Decreased Zookeeper load / increased Storm UI performance</h2>
+<h2 id="decreased-zookeeper-load-increased-apache-storm-ui-performance">Decreased Zookeeper load / increased Apache Storm UI performance</h2>
 
-<p>Storm sends significantly less traffic to Zookeeper now (on the order of 10x less). Since it also uses so many fewer znodes to store state, the UI is significantly faster as well. </p>
+<p>Apache Storm sends significantly less traffic to Zookeeper now (on the order of 10x less). Since it also uses so many fewer znodes to store state, the UI is significantly faster as well. </p>
 
 <h2 id="abstractions-for-shared-resources">Abstractions for shared resources</h2>
 
-<p>The TopologyContext has methods &quot;getTaskData&quot;, &quot;getExecutorData&quot;, and &quot;getResource&quot; for sharing resources at the task level, executor level, or worker level respectively. Currently you can&#39;t set any worker resources, but this is in development. Storm currently provides a shared ExecutorService worker resource (via &quot;getSharedExecutor&quot; method) that can be used for launching background tasks on a shared thread pool. </p>
+<p>The TopologyContext has methods &quot;getTaskData&quot;, &quot;getExecutorData&quot;, and &quot;getResource&quot; for sharing resources at the task level, executor level, or worker level respectively. Currently you can&#39;t set any worker resources, but this is in development. Apache Storm currently provides a shared ExecutorService worker resource (via &quot;getSharedExecutor&quot; method) that can be used for launching background tasks on a shared thread pool. </p>
 
 <h2 id="tick-tuples">Tick tuples</h2>
 
 <p>It&#39;s common to require a bolt to &quot;do something&quot; at a fixed interval, like flush writes to a database. Many people have been using variants of a ClockSpout to send these ticks. The problem with a ClockSpout is that you can&#39;t internalize the need for ticks within your bolt, so if you forget to set up your bolt correctly within your topology it won&#39;t work correctly. 0.8.0 introduces a new &quot;tick tuple&quot; config that lets you specify the frequency at which you want to receive tick tuples via the &quot;topology.tick.tuple.freq.secs&quot; component- specific config, and then your bolt will receive a tuple from the __system component and __tick stream at that frequency. </p>
 
-<h2 id="improved-storm-ui">Improved Storm UI</h2>
+<h2 id="improved-apache-storm-ui">Improved Apache Storm UI</h2>
 
-<p>The Storm UI now has a button for showing/hiding the &quot;system stats&quot; (tuples sent on streams other than ones you&#39;ve defined, like acker streams), making it easier to digest what your topology is doing.</p>
+<p>The Apache Storm UI now has a button for showing/hiding the &quot;system stats&quot; (tuples sent on streams other than ones you&#39;ve defined, like acker streams), making it easier to digest what your topology is doing.</p>
 
-<p>Here&#39;s the full changelog for Storm 0.8.0: </p>
+<p>Here&#39;s the full changelog for Apache Storm 0.8.0: </p>
 
 <ul>
 <li>Added Trident, the new high-level abstraction for intermixing high throughput, stateful stream processing with low-latency distributed querying </li>
@@ -371,8 +371,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -382,7 +382,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2012/09/06/storm081-released.html b/content/2012/09/06/storm081-released.html
index 48fc786..1bf2d9a 100644
--- a/content/2012/09/06/storm081-released.html
+++ b/content/2012/09/06/storm081-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.8.1 released</title>
+    <title>Apache Storm 0.8.1 released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.8.1 released
+                               Apache Storm 0.8.1 released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -230,9 +230,9 @@
                                 </div>
                             </div>
                         <div>
-                	        <p>Storm 0.8.1 is now available on the downloads page and in Maven. This release contains many bug fixes as well as a few important new features. These include: </p>
+                	        <p>Apache Storm 0.8.1 is now available on the downloads page and in Maven. This release contains many bug fixes as well as a few important new features. These include: </p>
 
-<h2 id="storms-unit-testing-facilities-have-been-exposed-via-java">Storm&#39;s unit testing facilities have been exposed via Java</h2>
+<h2 id="apache-storms-unit-testing-facilities-have-been-exposed-via-java">Apache Storm&#39;s unit testing facilities have been exposed via Java</h2>
 
 <p>This is an extremely powerful API that lets you do things like: 
    a) Easily bring up and tear down local clusters 
@@ -242,7 +242,7 @@
 
 <h2 id="spout-wait-strategies">Spout wait strategies</h2>
 
-<p>There&#39;s two situations in which a spout needs to wait. The first is when the max spout pending limit is reached. The second is when nothing is emitted from nextTuple. Previously, Storm would just have that spout sit in a busy loop in those cases. What Storm does in those situations is now pluggable, and the default is now for the spout to sleep for 1 ms. This will cause the spout to use dramatically less CPU when it hits those cases, and it also obviates the need for spouts to do any sleeping in their implementation to be &quot;polite&quot;. The wait strategy can be configured with TOPOLOGY_SPOUT_WAIT_STRATEGY and can be configured on a spout by spout basis. The interface to implement for a wait strategy is backtype.storm.spout.ISpoutWaitStrategy </p>
+<p>There&#39;s two situations in which a spout needs to wait. The first is when the max spout pending limit is reached. The second is when nothing is emitted from nextTuple. Previously, Apache Storm would just have that spout sit in a busy loop in those cases. What Apache Storm does in those situations is now pluggable, and the default is now for the spout to sleep for 1 ms. This will cause the spout to use dramatically less CPU when it hits those cases, and it also obviates the need for spouts to do any sleeping in their implementation to be &quot;polite&quot;. The wait strategy can be configured with TOPOLOGY_SPOUT_WAIT_STRATEGY and can be configured on a spout by spout basis. The interface to implement for a wait strategy is backtype.storm.spout.ISpoutWaitStrategy </p>
 
 <p>The full changelog is below: </p>
 
@@ -305,8 +305,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -316,7 +316,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2013/01/11/storm082-released.html b/content/2013/01/11/storm082-released.html
index 1982bad..6f08b85 100644
--- a/content/2013/01/11/storm082-released.html
+++ b/content/2013/01/11/storm082-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.8.2 released</title>
+    <title>Apache Storm 0.8.2 released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.8.2 released
+                               Apache Storm 0.8.2 released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -230,7 +230,7 @@
                                 </div>
                             </div>
                         <div>
-                	        <p>Storm 0.8.2 has been released and is available from <a href="/downloads.html">the downloads page</a>. This release contains a ton of improvements and fixes and is a highly recommended upgrade for everyone.</p>
+                	        <p>Apache Storm 0.8.2 has been released and is available from <a href="/downloads.html">the downloads page</a>. This release contains a ton of improvements and fixes and is a highly recommended upgrade for everyone.</p>
 
 <h2 id="isolation-scheduler">Isolation Scheduler</h2>
 
@@ -240,15 +240,15 @@
 
 <script src="https://gist.github.com/4514691.js"></script>
 
-<p>Any topologies submitted to the cluster not listed there will not be isolated. Note that there is no way for a user of Storm to affect their isolation settings – this is only allowed by the administrator of the cluster (this is very much intentional).</p>
+<p>Any topologies submitted to the cluster not listed there will not be isolated. Note that there is no way for a user of Apache Storm to affect their isolation settings – this is only allowed by the administrator of the cluster (this is very much intentional).</p>
 
 <p>The isolation scheduler solves the multi-tenancy problem – avoiding resource contention between topologies – by providing full isolation between topologies. The intention is that &quot;productionized&quot; topologies should be listed in the isolation config, and test or in-development topologies should not. The remaining machines on the cluster serve the dual role of failover for isolated topologies and for running the non-isolated topologies.</p>
 
-<h2 id="storm-ui-improvements">Storm UI improvements</h2>
+<h2 id="apache-storm-ui-improvements">Apache Storm UI improvements</h2>
 
-<p>The Storm UI has also been made significantly more useful. There are new stats &quot;#executed&quot;, &quot;execute latency&quot;, and &quot;capacity&quot; tracked for all bolts. The &quot;capacity&quot; metric is very useful and tells you what % of the time in the last 10 minutes the bolt spent executing tuples. If this value is close to 1, then the bolt is &quot;at capacity&quot; and is a bottleneck in your topology. The solution to at-capacity bolts is to increase the parallelism of that bolt.</p>
+<p>The Apache Storm UI has also been made significantly more useful. There are new stats &quot;#executed&quot;, &quot;execute latency&quot;, and &quot;capacity&quot; tracked for all bolts. The &quot;capacity&quot; metric is very useful and tells you what % of the time in the last 10 minutes the bolt spent executing tuples. If this value is close to 1, then the bolt is &quot;at capacity&quot; and is a bottleneck in your topology. The solution to at-capacity bolts is to increase the parallelism of that bolt.</p>
 
-<p>Another useful improvement is the ability to kill, activate, deactivate, and rebalance topologies from the Storm UI.</p>
+<p>Another useful improvement is the ability to kill, activate, deactivate, and rebalance topologies from the Apache Storm UI.</p>
 
 <h2 id="important-bug-fixes">Important bug fixes</h2>
 
@@ -332,8 +332,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -343,7 +343,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2013/12/08/storm090-released.html b/content/2013/12/08/storm090-released.html
index 3c5f184..ef1c4b7 100644
--- a/content/2013/12/08/storm090-released.html
+++ b/content/2013/12/08/storm090-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.9.0 Released</title>
+    <title>Apache Storm 0.9.0 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.9.0 Released
+                               Apache Storm 0.9.0 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -230,19 +230,19 @@
                                 </div>
                             </div>
                         <div>
-                	        <p>We are pleased to announce that Storm 0.9.0 has been released and is available from <a href="/downloads.html">the downloads page</a>. This release represents an important milestone in the evolution of Storm.</p>
+                	        <p>We are pleased to announce that Apache Storm 0.9.0 has been released and is available from <a href="/downloads.html">the downloads page</a>. This release represents an important milestone in the evolution of Apache Storm.</p>
 
-<p>While a number of new features have been added, a key focus area for this release has been stability-related fixes. Though many users are successfully running work-in-progress builds for Storm 0.9.x in production, this release represents the most stable version to-date, and is highly recommended for everyone, especially users of 0.8.x versions.</p>
+<p>While a number of new features have been added, a key focus area for this release has been stability-related fixes. Though many users are successfully running work-in-progress builds for Apache Storm 0.9.x in production, this release represents the most stable version to-date, and is highly recommended for everyone, especially users of 0.8.x versions.</p>
 
 <h2 id="netty-transport">Netty Transport</h2>
 
-<p>The first hightlight of this release is the new <a href="http://netty.io/index.html">Netty</a> Transport contributed by <a href="http://yahooeng.tumblr.com/">Yahoo! Engineering</a>. Storm&#39;s core network transport mechanism is now plugable, and Storm now comes with two implementations: The original 0MQ transport, and a new Netty-based implementation.</p>
+<p>The first hightlight of this release is the new <a href="http://netty.io/index.html">Netty</a> Transport contributed by <a href="http://yahooeng.tumblr.com/">Yahoo! Engineering</a>. Apache Storm&#39;s core network transport mechanism is now plugable, and Apache Storm now comes with two implementations: The original 0MQ transport, and a new Netty-based implementation.</p>
 
-<p>In earlier versions, Storm relied solely on 0MQ for transport. Since 0MQ is a native library, it was highly platform-dependent and, at times, challenging to install properly. In addition, stability between versions varied widely between versions and only a relatively old 0MQ version (2.1.7) was certified to work with Storm.</p>
+<p>In earlier versions, Apache Storm relied solely on 0MQ for transport. Since 0MQ is a native library, it was highly platform-dependent and, at times, challenging to install properly. In addition, stability between versions varied widely between versions and only a relatively old 0MQ version (2.1.7) was certified to work with Apache Storm.</p>
 
-<p>The Netty transport offers a pure Java alternative that eliminates Storm&#39;s dependency on native libraries. The Netty transport&#39;s performance is up to twice as fast as 0MQ, and it will open the door for authorization and authentication between worker processes. For an in-depth performance comparison of the 0MQ and Netty transports, see <a href="http://yahooeng.tumblr.com/post/64758709722/making-storm-fly-with-netty">this blog post</a> by Storm contributor <a href="https://github.com/revans2">Bobby Evans</a>.</p>
+<p>The Netty transport offers a pure Java alternative that eliminates Apache Storm&#39;s dependency on native libraries. The Netty transport&#39;s performance is up to twice as fast as 0MQ, and it will open the door for authorization and authentication between worker processes. For an in-depth performance comparison of the 0MQ and Netty transports, see <a href="http://yahooeng.tumblr.com/post/64758709722/making-storm-fly-with-netty">this blog post</a> by Apache Storm contributor <a href="https://github.com/revans2">Bobby Evans</a>.</p>
 
-<p>To configure Storm to use the Netty transport simply add the following to your <code>storm.yaml</code> configuration and adjust the values to best suit your use-case:</p>
+<p>To configure Apache Storm to use the Netty transport simply add the following to your <code>storm.yaml</code> configuration and adjust the values to best suit your use-case:</p>
 <div class="highlight"><pre><code class="language-" data-lang="">storm.messaging.transport: "backtype.storm.messaging.netty.Context"
 storm.messaging.netty.server_worker_threads: 1
 storm.messaging.netty.client_worker_threads: 1
@@ -255,38 +255,38 @@
 
 <h2 id="log-viewer-ui">Log Viewer UI</h2>
 
-<p>Storm now includes a helpful new feature for debugging and monitoring topologies: The <code>logviewer</code> daemon.</p>
+<p>Apache Storm now includes a helpful new feature for debugging and monitoring topologies: The <code>logviewer</code> daemon.</p>
 
-<p>In earlier versions of Storm, viewing worker logs involved determining a worker&#39;s location (host/port), typically through Storm UI, then <code>ssh</code>ing to that host and <code>tail</code>ing the corresponding worker log file. With the new log viewer. You can now easily access a specific worker&#39;s log in a web browser by clicking on a worker&#39;s port number right from Storm UI.</p>
+<p>In earlier versions of Apache Storm, viewing worker logs involved determining a worker&#39;s location (host/port), typically through Apache Storm UI, then <code>ssh</code>ing to that host and <code>tail</code>ing the corresponding worker log file. With the new log viewer. You can now easily access a specific worker&#39;s log in a web browser by clicking on a worker&#39;s port number right from Apache Storm UI.</p>
 
-<p>The <code>logviewer</code> daemon runs as a separate process on Storm supervisor nodes. To enable the <code>logviewer</code> run the following command (under supervision) on your cluster&#39;s supervisor nodes:</p>
+<p>The <code>logviewer</code> daemon runs as a separate process on Apache Storm supervisor nodes. To enable the <code>logviewer</code> run the following command (under supervision) on your cluster&#39;s supervisor nodes:</p>
 <div class="highlight"><pre><code class="language-" data-lang="">$ storm logviewer
 </code></pre></div>
 <h2 id="improved-windows-support">Improved Windows Support</h2>
 
-<p>In previous versions, running Storm on Microsoft Windows required installing third-party binaries (0MQ), modifying Storm&#39;s source, and adding Windows-specific scripts. With the addition of the platform-independent Netty transport, as well as numerous enhancements to make Storm more platform-independent, running Storm on Windows is easier than ever.</p>
+<p>In previous versions, running Apache Storm on Microsoft Windows required installing third-party binaries (0MQ), modifying Apache Storm&#39;s source, and adding Windows-specific scripts. With the addition of the platform-independent Netty transport, as well as numerous enhancements to make Apache Storm more platform-independent, running Apache Storm on Windows is easier than ever.</p>
 
 <h2 id="security-improvements">Security Improvements</h2>
 
-<p>Security, Authentication, and Authorization have been and will continue to be important focus areas for upcoming features. Storm 0.9.0 introduces an API for pluggable tuple serialization and a blowfish encryption based implementation for encrypting tuple data for sensitive use cases.</p>
+<p>Security, Authentication, and Authorization have been and will continue to be important focus areas for upcoming features. Apache Storm 0.9.0 introduces an API for pluggable tuple serialization and a blowfish encryption based implementation for encrypting tuple data for sensitive use cases.</p>
 
 <h2 id="api-compatibility-and-upgrading">API Compatibility and Upgrading</h2>
 
-<p>For most Storm topology developers, upgrading to 0.9.0 is simply a matter of updating the <a href="https://clojars.org/storm">dependency</a>. Storm&#39;s core API has changed very little since the 0.8.2 release.</p>
+<p>For most Apache Storm topology developers, upgrading to 0.9.0 is simply a matter of updating the <a href="https://clojars.org/storm">dependency</a>. Apache Storm&#39;s core API has changed very little since the 0.8.2 release.</p>
 
-<p>On the devops side, when upgrading to a new Storm release, it is safest to clear any existing state (Zookeeper, <code>storm.local.dir</code>), prior to upgrading.</p>
+<p>On the devops side, when upgrading to a new Apache Storm release, it is safest to clear any existing state (Zookeeper, <code>storm.local.dir</code>), prior to upgrading.</p>
 
 <h2 id="logging-changes">Logging Changes</h2>
 
-<p>Another important change in 0.9.0 has to do with logging. Storm has largely switched over to the <a href="http://www.slf4j.org">slf4j API</a> (backed by a <a href="http://logback.qos.ch">logback</a> logger implementation). Some Storm dependencies rely on the log4j API, so Storm currently depends on <a href="http://www.slf4j.org/legacy.html#log4j-over-slf4j">log4j-over-slf4j</a>.</p>
+<p>Another important change in 0.9.0 has to do with logging. Apache Storm has largely switched over to the <a href="http://www.slf4j.org">slf4j API</a> (backed by a <a href="http://logback.qos.ch">logback</a> logger implementation). Some Apache Storm dependencies rely on the log4j API, so Apache Storm currently depends on <a href="http://www.slf4j.org/legacy.html#log4j-over-slf4j">log4j-over-slf4j</a>.</p>
 
 <p>These changes have implications for existing topologies and topology components that use the log4j API.</p>
 
-<p>In general, and when possible, Storm topologies and topology components should use the <a href="http://www.slf4j.org">slf4j API</a> for logging.</p>
+<p>In general, and when possible, Apache Storm topologies and topology components should use the <a href="http://www.slf4j.org">slf4j API</a> for logging.</p>
 
 <h2 id="thanks">Thanks</h2>
 
-<p>Special thanks are due to all those who have contributed to Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.</p>
+<p>Special thanks are due to all those who have contributed to Apache Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.</p>
 
 <h2 id="changelog">Changelog</h2>
 
@@ -369,8 +369,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -380,7 +380,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/10/storm-logo-contest.html b/content/2014/04/10/storm-logo-contest.html
index e44574e..c10192a 100644
--- a/content/2014/04/10/storm-logo-contest.html
+++ b/content/2014/04/10/storm-logo-contest.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -230,9 +230,9 @@
                                 </div>
                             </div>
                         <div>
-                	        <p>Apache Storm is a platform for distributed, real-time computation that has been undergoing incubation at Apache since September 18, 2013. You can contribute by helping establish the Storm brand by submitting a proposal for the Apache Storm logo.</p>
+                	        <p>Apache Storm is a platform for distributed, real-time computation that has been undergoing incubation at Apache since September 18, 2013. You can contribute by helping establish the Apache Storm brand by submitting a proposal for the Apache Storm logo.</p>
 
-<p>Your proposal will be published on the <a href="http://storm.incubator.apache.org">Storm project website</a> next to the other proposals. On <strong>Wednesday, April 30, 2014</strong> the community will choose the new logo through a vote on the <a href="http://mail-archives.apache.org/mod_mbox/incubator-storm-dev/">Apache Storm Mailing List</a>. If more than 10 proposals are received, voting will take place in two rounds, with the first round selecting 10 proposals to move to round two.</p>
+<p>Your proposal will be published on the <a href="http://storm.incubator.apache.org">Apache Storm project website</a> next to the other proposals. On <strong>Wednesday, April 30, 2014</strong> the community will choose the new logo through a vote on the <a href="http://mail-archives.apache.org/mod_mbox/incubator-storm-dev/">Apache Storm Mailing List</a>. If more than 10 proposals are received, voting will take place in two rounds, with the first round selecting 10 proposals to move to round two.</p>
 
 <p>The winning artist will be credited on the Apache Storm website as having designed the logo, and may include a link to her/his website or blog. Prizes for the winner(s) are currently TBD.</p>
 
@@ -251,7 +251,7 @@
 <p>Optional, but nice to have:</p>
 
 <ul>
-<li>Icons representing storm components (suitable for use in diagrams, presentations, etc.):
+<li>Icons representing Apache Storm components (suitable for use in diagrams, presentations, etc.):
 
 <ul>
 <li>Spouts</li>
@@ -268,7 +268,7 @@
 
 <h2 id="inspiration">INSPIRATION</h2>
 
-<p>While designing the logo, keep in mind what describes Storm: </p>
+<p>While designing the logo, keep in mind what describes Apache Storm: </p>
 
 <ul>
 <li>Distributed Computation</li>
@@ -331,8 +331,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -342,7 +342,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/17/logo-pforrest.html b/content/2014/04/17/logo-pforrest.html
index 197ba28..2c17f18 100644
--- a/content/2014/04/17/logo-pforrest.html
+++ b/content/2014/04/17/logo-pforrest.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/17/logo-squinones.html b/content/2014/04/17/logo-squinones.html
index 7de35c8..78a45a7 100644
--- a/content/2014/04/17/logo-squinones.html
+++ b/content/2014/04/17/logo-squinones.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/19/logo-ssuleman.html b/content/2014/04/19/logo-ssuleman.html
index 9d95583..6b47cbf 100644
--- a/content/2014/04/19/logo-ssuleman.html
+++ b/content/2014/04/19/logo-ssuleman.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -266,8 +266,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -277,7 +277,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/21/logo-rmarshall.html b/content/2014/04/21/logo-rmarshall.html
index 1b83066..64a000d 100644
--- a/content/2014/04/21/logo-rmarshall.html
+++ b/content/2014/04/21/logo-rmarshall.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -270,8 +270,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -281,7 +281,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/22/logo-zsayari.html b/content/2014/04/22/logo-zsayari.html
index 4a937f1..2258781 100644
--- a/content/2014/04/22/logo-zsayari.html
+++ b/content/2014/04/22/logo-zsayari.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -266,8 +266,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -277,7 +277,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/23/logo-abartos.html b/content/2014/04/23/logo-abartos.html
index 51baf74..1f0fab9 100644
--- a/content/2014/04/23/logo-abartos.html
+++ b/content/2014/04/23/logo-abartos.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -272,8 +272,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -283,7 +283,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/27/logo-cboustead.html b/content/2014/04/27/logo-cboustead.html
index 1bf48f9..9fb079f 100644
--- a/content/2014/04/27/logo-cboustead.html
+++ b/content/2014/04/27/logo-cboustead.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/27/logo-sasili.html b/content/2014/04/27/logo-sasili.html
index 312a48a..eecab34 100644
--- a/content/2014/04/27/logo-sasili.html
+++ b/content/2014/04/27/logo-sasili.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -266,8 +266,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -277,7 +277,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/29/logo-jlee1.html b/content/2014/04/29/logo-jlee1.html
index d52cfe6..f6eff12 100644
--- a/content/2014/04/29/logo-jlee1.html
+++ b/content/2014/04/29/logo-jlee1.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -266,8 +266,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -277,7 +277,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/29/logo-jlee2.html b/content/2014/04/29/logo-jlee2.html
index 1393edc..302d1f9 100644
--- a/content/2014/04/29/logo-jlee2.html
+++ b/content/2014/04/29/logo-jlee2.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -266,8 +266,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -277,7 +277,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/04/29/logo-jlee3.html b/content/2014/04/29/logo-jlee3.html
index f45fb89..b55a9c9 100644
--- a/content/2014/04/29/logo-jlee3.html
+++ b/content/2014/04/29/logo-jlee3.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -266,8 +266,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -277,7 +277,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/05/27/round1-results.html b/content/2014/05/27/round1-results.html
index d7cbbb4..db81bf5 100644
--- a/content/2014/05/27/round1-results.html
+++ b/content/2014/05/27/round1-results.html
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,13 +190,13 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
@@ -232,13 +232,13 @@
                         <div>
                 	        <h1 id="logo-contest-round-1-results">Logo Contest - Round 1 Results</h1>
 
-<p>Round one of the Apache Storm logo contest is now complete and was a great success. We received votes from 7 PPMC members as well as 46 votes from the greater Storm community.</p>
+<p>Round one of the Apache Storm logo contest is now complete and was a great success. We received votes from 7 PPMC members as well as 46 votes from the greater Apache Storm community.</p>
 
 <p>We would like to extend a very special thanks to all those who took the time and effort to create and submit a logo proposal. We would also like to thank everyone who voted.</p>
 
 <h2 id="results">Results</h2>
 
-<p>The Storm PPMC and community votes were closely aligned, with the community vote resolving a PPMC tie for the 3rd finalist as shown in the result table below.</p>
+<p>The Apache Storm PPMC and community votes were closely aligned, with the community vote resolving a PPMC tie for the 3rd finalist as shown in the result table below.</p>
 
 <p>The three finalists entering the final round are:</p>
 
@@ -350,8 +350,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -361,7 +361,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/06/17/contest-results.html b/content/2014/06/17/contest-results.html
index 7b26241..8ce7e87 100644
--- a/content/2014/06/17/contest-results.html
+++ b/content/2014/06/17/contest-results.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm Logo Contest Results</title>
+    <title>Apache Storm Logo Contest Results</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm Logo Contest Results
+                               Apache Storm Logo Contest Results
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -230,13 +230,13 @@
                                 </div>
                             </div>
                         <div>
-                	        <p>The Apache Storm logo contest is now complete and was a great success. We received votes from 7 PPMC members as well as 55 votes from the greater Storm community. Thank you to everyone who participated by voting.</p>
+                	        <p>The Apache Storm logo contest is now complete and was a great success. We received votes from 7 PPMC members as well as 55 votes from the greater Apache Storm community. Thank you to everyone who participated by voting.</p>
 
 <h2 id="the-winner">The Winner</h2>
 
-<p>Congratulations to Jennifer Lee, whose <a href="/2014/04/29/logo-jlee2.html">3rd entry</a> received the most points from both the PPMC as well as the Storm community. Final vote tallies are listed below.</p>
+<p>Congratulations to Jennifer Lee, whose <a href="/2014/04/29/logo-jlee2.html">3rd entry</a> received the most points from both the PPMC as well as the Apache Storm community. Final vote tallies are listed below.</p>
 
-<p><img src="/images/logocontest/storm_logo_winner.png" alt="Storm Logo"></p>
+<p><img src="/images/logocontest/storm_logo_winner.png" alt="Apache Storm Logo"></p>
 
 <p>The Apache Storm project management team will now begin the process of finalizing the logo and making it official.</p>
 
@@ -300,8 +300,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -311,7 +311,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/06/25/storm092-released.html b/content/2014/06/25/storm092-released.html
index b4749e5..7a23248 100644
--- a/content/2014/06/25/storm092-released.html
+++ b/content/2014/06/25/storm092-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.9.2 released</title>
+    <title>Apache Storm 0.9.2 released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.9.2 released
+                               Apache Storm 0.9.2 released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -230,27 +230,27 @@
                                 </div>
                             </div>
                         <div>
-                	        <p>We are pleased to announce that Storm 0.9.2-incubating has been released and is available from <a href="/downloads.html">the downloads page</a>. This release includes many important fixes and improvements.</p>
+                	        <p>We are pleased to announce that Apache Storm 0.9.2-incubating has been released and is available from <a href="/downloads.html">the downloads page</a>. This release includes many important fixes and improvements.</p>
 
 <h2 id="netty-transport-improvements">Netty Transport Improvements</h2>
 
-<p>Storm&#39;s Netty-based transport has been overhauled to significantly improve performance through better utilization of thread, CPU, and network resources, particularly in cases where message sizes are small. Storm contributor Sean Zhong (<a href="https://github.com/clockfly">@clockfly</a>) deserves a great deal of credit not only for discovering, analyzing, documenting and fixing the root cause, but also for persevering through an extended review process and promptly addressing all concerns.</p>
+<p>Apache Storm&#39;s Netty-based transport has been overhauled to significantly improve performance through better utilization of thread, CPU, and network resources, particularly in cases where message sizes are small. Apache Storm contributor Sean Zhong (<a href="https://github.com/clockfly">@clockfly</a>) deserves a great deal of credit not only for discovering, analyzing, documenting and fixing the root cause, but also for persevering through an extended review process and promptly addressing all concerns.</p>
 
 <p>Those interested in the technical details and evolution of this patch can find out more in the <a href="https://issues.apache.org/jira/browse/STORM-297">JIRA ticket for STORM-297</a>.</p>
 
-<p>Sean also discovered and fixed an <a href="https://issues.apache.org/jira/browse/STORM-342">elusive bug</a> in Storm&#39;s usage of the Disruptor queue that could lead to out-of-order or lost messages. </p>
+<p>Sean also discovered and fixed an <a href="https://issues.apache.org/jira/browse/STORM-342">elusive bug</a> in Apache Storm&#39;s usage of the Disruptor queue that could lead to out-of-order or lost messages. </p>
 
 <p>Many thanks to Sean for contributing these important fixes.</p>
 
-<h2 id="storm-ui-improvements">Storm UI Improvements</h2>
+<h2 id="apache-storm-ui-improvements">Apache Storm UI Improvements</h2>
 
-<p>This release also includes a number of improvements to the Storm UI service. Contributor Sriharsha Chintalapani(<a href="https://github.com/harshach">@harshach</a>) added a REST API to the Storm UI service to expose metrics and operations in JSON format, and updated the UI to use that API.</p>
+<p>This release also includes a number of improvements to the Apache Storm UI service. Contributor Sriharsha Chintalapani(<a href="https://github.com/harshach">@harshach</a>) added a REST API to the Apache Storm UI service to expose metrics and operations in JSON format, and updated the UI to use that API.</p>
 
-<p>The new REST API will make it considerably easier for other services to consume availabe cluster and topology metrics for monitoring and visualization applications. Kyle Nusbaum (<a href="https://github.com/knusbaum">@knusbaum</a>) has already leveraged the REST API to create a topology visualization tool now included in Storm UI and illustrated in the screenshot below.</p>
+<p>The new REST API will make it considerably easier for other services to consume availabe cluster and topology metrics for monitoring and visualization applications. Kyle Nusbaum (<a href="https://github.com/knusbaum">@knusbaum</a>) has already leveraged the REST API to create a topology visualization tool now included in Apache Storm UI and illustrated in the screenshot below.</p>
 
 <p>&nbsp;</p>
 
-<p><img src="/images/ui_topology_viz.png" alt="Storm UI Topology Visualization"></p>
+<p><img src="/images/ui_topology_viz.png" alt="Apache Storm UI Topology Visualization"></p>
 
 <p>&nbsp;</p>
 
@@ -258,11 +258,11 @@
 
 <h2 id="kafka-spout">Kafka Spout</h2>
 
-<p>This is the first Storm release to include official support for consuming data from Kafka 0.8.x. In the past, development of Kafka spouts for Storm had become somewhat fragmented and finding an implementation that worked with certain versions of Storm and Kafka proved burdensome for some developers. This is no longer the case, as the <code>storm-kafka</code> module is now part of the Storm project and associated artifacts are released to official channels (Maven Central) along with Storm&#39;s other components.</p>
+<p>This is the first Apache Storm release to include official support for consuming data from Kafka 0.8.x. In the past, development of Kafka spouts for Apache Storm had become somewhat fragmented and finding an implementation that worked with certain versions of Apache Storm and Kafka proved burdensome for some developers. This is no longer the case, as the <code>storm-kafka</code> module is now part of the Apache Storm project and associated artifacts are released to official channels (Maven Central) along with Apache Storm&#39;s other components.</p>
 
-<p>Thanks are due to GitHub user <a href="">@wurstmeister</a> for picking up Nathan Marz&#39; original Kafka 0.7.x implementation, updating it to work with Kafka 0.8.x, and contributing that work back to the Storm community.</p>
+<p>Thanks are due to GitHub user <a href="">@wurstmeister</a> for picking up Nathan Marz&#39; original Kafka 0.7.x implementation, updating it to work with Kafka 0.8.x, and contributing that work back to the Apache Storm community.</p>
 
-<p>The <code>storm-kafka</code> module can be found in the <code>/external/</code> directory of the source tree and binary distributions. The <code>external</code> area has been set up to contain projects that while not required by Storm, are often used in conjunction with Storm to integrate with some other technology. Such projects also come with a maintenance committment from at least one Storm committer to ensure compatibility with Storm&#39;s main codebase as it evolves.</p>
+<p>The <code>storm-kafka</code> module can be found in the <code>/external/</code> directory of the source tree and binary distributions. The <code>external</code> area has been set up to contain projects that while not required by Apache Storm, are often used in conjunction with Apache Storm to integrate with some other technology. Such projects also come with a maintenance committment from at least one Apache Storm committer to ensure compatibility with Apache Storm&#39;s main codebase as it evolves.</p>
 
 <p>The <code>storm-kafka</code> dependency is available now from Maven Central at the following coordinates:</p>
 <div class="highlight"><pre><code class="language-" data-lang="">groupId: org.apache.storm
@@ -271,19 +271,19 @@
 </code></pre></div>
 <p>Users, and Scala developers in particular, should note that the Kafka dependency is listed as <code>provided</code>. This allows users to choose a specific Scala version as described in the <a href="https://github.com/apache/incubator-storm/tree/v0.9.2-incubating/external/storm-kafka">project README</a>.</p>
 
-<h2 id="storm-starter-and-examples">Storm Starter and Examples</h2>
+<h2 id="apache-storm-starter-and-examples">Apache Storm Starter and Examples</h2>
 
-<p>Similar to the <code>external</code> section of the codebase, we have also added an <code>examples</code> directory and pulled in the <code>storm-starter</code> project to ensure it will be maintained in lock-step with Storm&#39;s main codebase.</p>
+<p>Similar to the <code>external</code> section of the codebase, we have also added an <code>examples</code> directory and pulled in the <code>storm-starter</code> project to ensure it will be maintained in lock-step with Apache Storm&#39;s main codebase.</p>
 
-<p>Thank you to Storm committer Michael G. Noll for his continued work in maintaining and improving the <code>storm-starter</code> project.</p>
+<p>Thank you to Apache Storm committer Michael G. Noll for his continued work in maintaining and improving the <code>storm-starter</code> project.</p>
 
 <h2 id="plugable-serialization-for-multilang">Plugable Serialization for Multilang</h2>
 
-<p>In previous versions of Storm, serialization of data to and from multilang components was limited to JSON, imposing somewhat of performance penalty. Thanks to a contribution from John Gilmore (<a href="https://github.com/jsgilmore">@jsgilmore</a>) the serialization mechanism is now plugable and enables the use of more performant serialization frameworks like protocol buffers in addition to JSON.</p>
+<p>In previous versions of Apache Storm, serialization of data to and from multilang components was limited to JSON, imposing somewhat of performance penalty. Thanks to a contribution from John Gilmore (<a href="https://github.com/jsgilmore">@jsgilmore</a>) the serialization mechanism is now plugable and enables the use of more performant serialization frameworks like protocol buffers in addition to JSON.</p>
 
 <h2 id="thanks">Thanks</h2>
 
-<p>Special thanks are due to all those who have contributed to Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.</p>
+<p>Special thanks are due to all those who have contributed to Apache Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.</p>
 
 <h2 id="changelog">Changelog</h2>
 
@@ -388,8 +388,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -399,7 +399,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/10/20/storm093-release-candidate.html b/content/2014/10/20/storm093-release-candidate.html
index 183faf3..6a0c183 100644
--- a/content/2014/10/20/storm093-release-candidate.html
+++ b/content/2014/10/20/storm093-release-candidate.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.9.3 release candidate 1 available</title>
+    <title>Apache Storm 0.9.3 release candidate 1 available</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.9.3 release candidate 1 available
+                               Apache Storm 0.9.3 release candidate 1 available
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,9 +232,9 @@
                         <div>
                 	        <p>We are pleased to announce that Apache Storm version 0.9.3 has reached the release candidate stage.  The latest release is 0.9.3-rc1.  We are moving closer to the GA release, so this is a good time to give this new 0.9.3 version a try!</p>
 
-<p>Storm 0.9.3 is a maintenance release with bug fixes and better stability as summarized in the <a href="https://github.com/apache/storm/blob/master/CHANGELOG.md">0.9.3 changelog</a>.  On top of that version 0.9.3 continues to improve the integration with <a href="http://kafka.apache.org/">Apache Kafka</a> as well as the <a href="https://github.com/apache/storm/blob/master/external/storm-kafka/README.md">documentation of the core spout and Trident spout for Kafka</a>, which will provide our users with the best Kafka connectivity for Storm to date.</p>
+<p>Apache Storm 0.9.3 is a maintenance release with bug fixes and better stability as summarized in the <a href="https://github.com/apache/storm/blob/master/CHANGELOG.md">0.9.3 changelog</a>.  On top of that version 0.9.3 continues to improve the integration with <a href="http://kafka.apache.org/">Apache Kafka</a> as well as the <a href="https://github.com/apache/storm/blob/master/external/storm-kafka/README.md">documentation of the core spout and Trident spout for Kafka</a>, which will provide our users with the best Kafka connectivity for Apache Storm to date.</p>
 
-<p>We heartily encourage you to <a href="http://storm.apache.org/downloads.html">test the 0.9.3 release candidate</a> and provide your feedback regarding any issues via <a href="http://storm.apache.org/community.html">our mailing lists</a>, which is an easy and valuable way to contribute back to the Storm community and to help us moving to an official 0.9.3 release.  You can find the <a href="http://storm.apache.org/downloads.html">0.9.3 release candidate in our Downloads section</a>.</p>
+<p>We heartily encourage you to <a href="http://storm.apache.org/downloads.html">test the 0.9.3 release candidate</a> and provide your feedback regarding any issues via <a href="http://storm.apache.org/community.html">our mailing lists</a>, which is an easy and valuable way to contribute back to the Apache Storm community and to help us moving to an official 0.9.3 release.  You can find the <a href="http://storm.apache.org/downloads.html">0.9.3 release candidate in our Downloads section</a>.</p>
 
                 	    </div>
                     </div>
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2014/11/25/storm093-released.html b/content/2014/11/25/storm093-released.html
index 3d7e732..35d7b9e 100644
--- a/content/2014/11/25/storm093-released.html
+++ b/content/2014/11/25/storm093-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.9.3 released</title>
+    <title>Apache Storm 0.9.3 released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.9.3 released
+                               Apache Storm 0.9.3 released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -236,25 +236,25 @@
 
 <p>Apache Storm has supported <a href="http://kafka.apache.org/">Apache Kafka</a> as a streaming data source since version 0.9.2-incubating. Version 0.9.3 brings a number of improvements to the Kafka integration including the ability to write data to one or more Kafka clusters and topics.</p>
 
-<p>The ability to both read from and write to Kafka further unlocks potential of the already powerful combination of Storm and Kafka. Storm users can now use Kafka as a source of and destination for streaming data. This allows for inter-topology communication, topology chaining, combining spout/bolt-based topologies with Trident-based data flows, and integration with any external system that supports data ingest from Kafka.</p>
+<p>The ability to both read from and write to Kafka further unlocks potential of the already powerful combination of Apache Storm and Kafka. Apache Storm users can now use Kafka as a source of and destination for streaming data. This allows for inter-topology communication, topology chaining, combining spout/bolt-based topologies with Trident-based data flows, and integration with any external system that supports data ingest from Kafka.</p>
 
-<p>More information about Storm&#39;s Kafka integration can be found in the <a href="https://github.com/apache/storm/blob/v0.9.3/external/storm-kafka/README.md">storm-kafka project documentation</a>.</p>
+<p>More information about Apache Storm&#39;s Kafka integration can be found in the <a href="https://github.com/apache/storm/blob/v0.9.3/external/storm-kafka/README.md">storm-kafka project documentation</a>.</p>
 
 <h2 id="hdfs-integration">HDFS Integration</h2>
 
 <p>Many stream processing use cases involve storing data in HDFS for further analysis and offline (batch) processing. Apache Storm’s HDFS integration consists of several bolt and Trident state implementations that allow topology developers to easily write data to HDFS from any Storm topology. </p>
 
-<p>More information about Storm&#39;s HDFS integration can be found in the <a href="https://github.com/apache/storm/tree/v0.9.3/external/storm-hdfs">storm-hdfs project documentation</a>.</p>
+<p>More information about Apache Storm&#39;s HDFS integration can be found in the <a href="https://github.com/apache/storm/tree/v0.9.3/external/storm-hdfs">storm-hdfs project documentation</a>.</p>
 
 <h2 id="hbase-integration">HBase Integration</h2>
 
-<p>Apache Storm’s HBase integration includes a number of components that allow Storm topologies to both write to and query HBase in real-time. Many organizations use Apache HBase as part of their big data strategy for batch, interactive, and real-time workflows. Storm’s HBase integration allows users to leverage data assets in HBase as streaming queries, as well as using HBase as a destination for streaming computation results.</p>
+<p>Apache Storm’s HBase integration includes a number of components that allow Apache Storm topologies to both write to and query HBase in real-time. Many organizations use Apache HBase as part of their big data strategy for batch, interactive, and real-time workflows. Apache Storm HBase integration allows users to leverage data assets in HBase as streaming queries, as well as using HBase as a destination for streaming computation results.</p>
 
-<p>More information about Storm&#39;s HBase integration can be found in the <a href="https://github.com/apache/storm/tree/v0.9.3/external/storm-hbase">storm-hbase project documentation</a>.</p>
+<p>More information about Apache Storm&#39;s HBase integration can be found in the <a href="https://github.com/apache/storm/tree/v0.9.3/external/storm-hbase">storm-hbase project documentation</a>.</p>
 
 <h2 id="reduced-dependency-conflicts">Reduced Dependency Conflicts</h2>
 
-<p>In previous Storm releases, it was not uncommon for users&#39; topology dependencies to conflict with the libraries used by Storm. In Storm 0.9.3 several dependency packages that were common sources of conflicts have been package-relocated (shaded) to avoid this situation. Developers are free to use the Storm-packaged versions, or supply their own version. </p>
+<p>In previous Apache Storm releases, it was not uncommon for users&#39; topology dependencies to conflict with the libraries used by Apache Storm. In Apache Storm 0.9.3 several dependency packages that were common sources of conflicts have been package-relocated (shaded) to avoid this situation. Developers are free to use the Storm-packaged versions, or supply their own version. </p>
 
 <p>The following table lists the dependency package relocations:</p>
 
@@ -262,7 +262,7 @@
 <tr>
 <th style="text-align: left">Dependency</th>
 <th style="text-align: left">Original Package</th>
-<th style="text-align: left">Storm Package</th>
+<th style="text-align: left">Apache Storm Package</th>
 </tr>
 </thead><tbody>
 <tr>
@@ -310,7 +310,7 @@
 
 <h2 id="thanks">Thanks</h2>
 
-<p>Special thanks are due to all those who have contributed to Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.</p>
+<p>Special thanks are due to all those who have contributed to Apache Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.</p>
 
 <h2 id="full-changelog">Full Changelog</h2>
 
@@ -449,8 +449,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -460,7 +460,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2015/03/25/storm094-released.html b/content/2015/03/25/storm094-released.html
index 94267cd..9bd7b9c 100644
--- a/content/2015/03/25/storm094-released.html
+++ b/content/2015/03/25/storm094-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.9.4 released</title>
+    <title>Apache Storm 0.9.4 released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.9.4 released
+                               Apache Storm 0.9.4 released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 0.9.4 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -280,8 +280,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -291,7 +291,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2015/06/04/storm095-released.html b/content/2015/06/04/storm095-released.html
index 3b20033..0908400 100644
--- a/content/2015/06/04/storm095-released.html
+++ b/content/2015/06/04/storm095-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.9.5 released</title>
+    <title>Apache Storm 0.9.5 released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.9.5 released
+                               Apache Storm 0.9.5 released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 0.9.5 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -279,8 +279,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -290,7 +290,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2015/06/15/storm0100-beta-released.html b/content/2015/06/15/storm0100-beta-released.html
index b7523fd..653526e 100644
--- a/content/2015/06/15/storm0100-beta-released.html
+++ b/content/2015/06/15/storm0100-beta-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.10.0 Beta Released</title>
+    <title>Apache Storm 0.10.0 Beta Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.10.0 Beta Released
+                               Apache Storm 0.10.0 Beta Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -236,11 +236,11 @@
 
 <h2 id="secure-multi-tenant-deployment">Secure, Multi-Tenant Deployment</h2>
 
-<p>Much like the early days of Hadoop, Apache Storm originally evolved in an environment where security was not a high-priority concern. Rather, it was assumed that Storm would be deployed to environments suitably cordoned off from security threats. While a large number of users were comfortable setting up their own security measures for Storm (usually at the Firewall/OS level), this proved a hindrance to broader adoption among larger enterprises where security policies prohibited deployment without specific safeguards.</p>
+<p>Much like the early days of Hadoop, Apache Storm originally evolved in an environment where security was not a high-priority concern. Rather, it was assumed that Apache Storm would be deployed to environments suitably cordoned off from security threats. While a large number of users were comfortable setting up their own security measures for Apache Storm (usually at the Firewall/OS level), this proved a hindrance to broader adoption among larger enterprises where security policies prohibited deployment without specific safeguards.</p>
 
-<p>Yahoo! hosts one of the largest Storm deployments in the world, and their engineering team recognized the need for security early on, so it implemented many of the features necessary to secure its own Apache Storm deployment. Yahoo!, Hortonworks, Symantec, and the broader Apache Storm community have worked together to bring those security innovations into the main Apache Storm code base.</p>
+<p>Yahoo! hosts one of the largest Apache Storm deployments in the world, and their engineering team recognized the need for security early on, so it implemented many of the features necessary to secure its own Apache Storm deployment. Yahoo!, Hortonworks, Symantec, and the broader Apache Storm community have worked together to bring those security innovations into the main Apache Storm code base.</p>
 
-<p>We are pleased to announce that work is now complete. Some of the highlights of Storm&#39;s new security features include:</p>
+<p>We are pleased to announce that work is now complete. Some of the highlights of Apache Storm&#39;s new security features include:</p>
 
 <ul>
 <li>Kerberos Authentication with Automatic Credential Push and Renewal</li>
@@ -252,19 +252,19 @@
 <li>User isolation (Storm topologies run as the user who submitted them)</li>
 </ul>
 
-<p>For more details and instructions for securing Storm, please see <a href="https://github.com/apache/storm/blob/v0.10.0-beta/SECURITY.md">the security documentation</a>.</p>
+<p>For more details and instructions for securing Apache Storm, please see <a href="https://github.com/apache/storm/blob/v0.10.0-beta/SECURITY.md">the security documentation</a>.</p>
 
 <h2 id="a-foundation-for-rolling-upgrades-and-continuity-of-operations">A Foundation for Rolling Upgrades and Continuity of Operations</h2>
 
-<p>In the past, upgrading a Storm cluster could be an arduous process that involved un-deploying existing topologies, removing state from local disk and ZooKeeper, installing the upgrade, and finally redeploying topologies. From an operations perspective, this process was disruptive to say the very least.</p>
+<p>In the past, upgrading an Apache Storm cluster could be an arduous process that involved un-deploying existing topologies, removing state from local disk and ZooKeeper, installing the upgrade, and finally redeploying topologies. From an operations perspective, this process was disruptive to say the very least.</p>
 
-<p>The underlying cause of this headache was rooted in the data format Storm processes used to store both local and distributed state. Between versions, these data structures would change in incompatible ways.</p>
+<p>The underlying cause of this headache was rooted in the data format Apache Storm processes used to store both local and distributed state. Between versions, these data structures would change in incompatible ways.</p>
 
-<p>Beginning with version 0.10.0, this limitation has been eliminated. In the future, upgrading from Storm 0.10.0 to a newer version can be accomplished seamlessly, with zero down time. In fact, for users who use <a href="https://ambari.apache.org">Apache Ambari</a> for cluster provisioning and management, the process can be completely automated.</p>
+<p>Beginning with version 0.10.0, this limitation has been eliminated. In the future, upgrading from Apache Storm 0.10.0 to a newer version can be accomplished seamlessly, with zero down time. In fact, for users who use <a href="https://ambari.apache.org">Apache Ambari</a> for cluster provisioning and management, the process can be completely automated.</p>
 
 <h2 id="easier-deployment-and-declarative-topology-wiring-with-flux">Easier Deployment and Declarative Topology Wiring with Flux</h2>
 
-<p>Apache Storm 0.10.0 now includes Flux, which is a framework and set of utilities that make defining and deploying Storm topologies less painful and developer-intensive. A common pain point mentioned by Storm users is the fact that the wiring for a Topology graph is often tied up in Java code, and that any changes require recompilation and repackaging of the topology jar file. Flux aims to alleviate that pain by allowing you to package all your Storm components in a single jar, and use an external text file to define the layout and configuration of your topologies.</p>
+<p>Apache Storm 0.10.0 now includes Flux, which is a framework and set of utilities that make defining and deploying Apache Storm topologies less painful and developer-intensive. A common pain point mentioned by Apache Storm users is the fact that the wiring for a Topology graph is often tied up in Java code, and that any changes require recompilation and repackaging of the topology jar file. Flux aims to alleviate that pain by allowing you to package all your Apache Storm components in a single jar, and use an external text file to define the layout and configuration of your topologies.</p>
 
 <p>Some of Flux&#39; features include:</p>
 
@@ -281,15 +281,15 @@
 
 <h2 id="partial-key-groupings">Partial Key Groupings</h2>
 
-<p>In addition to the standard Stream Groupings Storm has always supported, version 0.10.0 introduces a new grouping named &quot;Partial Key Grouping&quot;. With the Partial Stream Grouping, the tuple  stream is partitioned by the fields specified in the grouping, like the Fields Grouping, but are load balanced between two downstream bolts, which provides better utilization of resources when the incoming data is skewed. </p>
+<p>In addition to the standard Stream Groupings Apache Storm has always supported, version 0.10.0 introduces a new grouping named &quot;Partial Key Grouping&quot;. With the Partial Stream Grouping, the tuple  stream is partitioned by the fields specified in the grouping, like the Fields Grouping, but are load balanced between two downstream bolts, which provides better utilization of resources when the incoming data is skewed. </p>
 
-<p>Documentation for the Partial Key Grouping and other stream groupings supported by Storm can be found <a href="https://storm.apache.org/documentation/Concepts.html">here</a>. <a href="https://melmeric.files.wordpress.com/2014/11/the-power-of-both-choices-practical-load-balancing-for-distributed-stream-processing-engines.pdf">This research paper</a> provides additional details regarding how it works and its advantages.</p>
+<p>Documentation for the Partial Key Grouping and other stream groupings supported by Apache Storm can be found <a href="https://storm.apache.org/documentation/Concepts.html">here</a>. <a href="https://melmeric.files.wordpress.com/2014/11/the-power-of-both-choices-practical-load-balancing-for-distributed-stream-processing-engines.pdf">This research paper</a> provides additional details regarding how it works and its advantages.</p>
 
 <h2 id="improved-logging-framework">Improved Logging Framework</h2>
 
-<p>Debugging distributed applications can be difficult, and usually focuses on one main source of information: application log files. But in a very low latency system like Storm where every millisecond counts, logging can be a double-edged sword: If you log too little information you may miss the information you need to solve a problem; log too much and you risk degrading the overall performance of your application as resources are consumed by the logging framework.</p>
+<p>Debugging distributed applications can be difficult, and usually focuses on one main source of information: application log files. But in a very low latency system like Apache Storm where every millisecond counts, logging can be a double-edged sword: If you log too little information you may miss the information you need to solve a problem; log too much and you risk degrading the overall performance of your application as resources are consumed by the logging framework.</p>
 
-<p>In version 0.10.0 Storm&#39;s logging framework now uses <a href="http://logging.apache.org/log4j/2.x/">Apache Log4j 2</a> which, like Storm&#39;s internal messaging subsystem, uses the extremely performant <a href="https://lmax-exchange.github.io/disruptor/">LMAX Disruptor</a> messaging library. Log4j 2 boast an 18x higher throughput and orders of magnitude lower latency than Storm&#39;s previous logging framework. More efficient resource utilization at the logging level means more resources are available where they matter most: executing your business logic.</p>
+<p>In version 0.10.0 Apache Storm&#39;s logging framework now uses <a href="http://logging.apache.org/log4j/2.x/">Apache Log4j 2</a> which, like Apache Storm&#39;s internal messaging subsystem, uses the extremely performant <a href="https://lmax-exchange.github.io/disruptor/">LMAX Disruptor</a> messaging library. Log4j 2 boast an 18x higher throughput and orders of magnitude lower latency than Apache Storm&#39;s previous logging framework. More efficient resource utilization at the logging level means more resources are available where they matter most: executing your business logic.</p>
 
 <p>A few of the important features these changes bring include:</p>
 
@@ -305,46 +305,46 @@
 
 <p>Introduced in version 0.13, <a href="https://hive.apache.org">Apache Hive</a> includes a <a href="https://cwiki.apache.org/confluence/display/Hive/Streaming+Data+Ingest">Streaming Data Ingest API</a> that allows data to be written continuously into Hive. The incoming data can be continuously committed in small batches of records into existing Hive partition or table. Once the data is committed its immediately visible to all hive queries.</p>
 
-<p>Apache Storm 0.10.0 introduces both a Storm Core API bolt implementation 
-that allows users to stream data from Storm directly into hive. Storm&#39;s Hive integration also includes a <a href="https://storm.apache.org/documentation/Trident-state">State</a> implementation for Storm&#39;s Micro-batching/Transactional API (Trident) that allows you to write to Hive from a micro-batch/transactional topology and supports exactly-once semantics for data persistence.</p>
+<p>Apache Storm 0.10.0 introduces both a Apache Storm Core API bolt implementation 
+that allows users to stream data from Apache Storm directly into hive. Apache Storm&#39;s Hive integration also includes a <a href="https://storm.apache.org/documentation/Trident-state">State</a> implementation for Apache Storm&#39;s Micro-batching/Transactional API (Trident) that allows you to write to Hive from a micro-batch/transactional topology and supports exactly-once semantics for data persistence.</p>
 
-<p>For more information on Storm&#39;s Hive integration, see the <a href="https://github.com/apache/storm/blob/v0.10.0-beta/external/storm-hive/README.md">storm-hive documentation</a>.</p>
+<p>For more information on Apache Storm&#39;s Hive integration, see the <a href="https://github.com/apache/storm/blob/v0.10.0-beta/external/storm-hive/README.md">storm-hive documentation</a>.</p>
 
 <h2 id="microsoft-azure-event-hubs-integration">Microsoft Azure Event Hubs Integration</h2>
 
-<p>With Microsoft Azure&#39;s <a href="https://azure.microsoft.com/en-us/documentation/articles/hdinsight-storm-overview/">support for running Storm on HDInsight</a>, Storm is now a first class citizen of the Azure cloud computing platform. To better support Storm integration with Azure services, Microsoft engineers have contributed several components that allow Storm to integrate directly with <a href="http://azure.microsoft.com/en-us/services/event-hubs/">Microsoft Azure Event Hubs</a>.</p>
+<p>With Microsoft Azure&#39;s <a href="https://azure.microsoft.com/en-us/documentation/articles/hdinsight-storm-overview/">support for running Apache Storm on HDInsight</a>, Apache Storm is now a first class citizen of the Azure cloud computing platform. To better support Apache Storm integration with Azure services, Microsoft engineers have contributed several components that allow Apache Storm to integrate directly with <a href="http://azure.microsoft.com/en-us/services/event-hubs/">Microsoft Azure Event Hubs</a>.</p>
 
-<p>Storm&#39;s Event Hubs integration includes both spout and bolt implementations for reading from, and writing to Event Hubs. The Event Hub integration also includes a Micro-batching/Transactional (Trident) spout implementation that supports fully fault-tolerant and reliable processing, as well as support for exactly-once message processing semantics.</p>
+<p>Apache Storm&#39;s Event Hubs integration includes both spout and bolt implementations for reading from, and writing to Event Hubs. The Event Hub integration also includes a Micro-batching/Transactional (Trident) spout implementation that supports fully fault-tolerant and reliable processing, as well as support for exactly-once message processing semantics.</p>
 
 <h2 id="redis-support">Redis Support</h2>
 
-<p>Apache Storm 0.10.0 also introduces support for the <a href="http://redis.io">Redis</a> data structure server. Storm&#39;s Redis support includes bolt implementations for both writing to and querying Redis from a Storm topology, and is easily extended for custom use cases. For Storm&#39;s micro-batching/transactional API, the Redis support includes both <a href="https://storm.apache.org/documentation/Trident-state.html">Trident State and MapState</a> implementations for fault-tolerant state management with Redis.</p>
+<p>Apache Storm 0.10.0 also introduces support for the <a href="http://redis.io">Redis</a> data structure server. Apache Storm&#39;s Redis support includes bolt implementations for both writing to and querying Redis from a Apache Storm topology, and is easily extended for custom use cases. For Apache Storm&#39;s micro-batching/transactional API, the Redis support includes both <a href="https://storm.apache.org/documentation/Trident-state.html">Trident State and MapState</a> implementations for fault-tolerant state management with Redis.</p>
 
 <p>Further information can be found in the <a href="https://github.com/apache/storm/blob/v0.10.0-beta/external/storm-redis/README.md">storm-redis documentation</a>.</p>
 
 <h2 id="jdbc-rdbms-integration">JDBC/RDBMS Integration</h2>
 
-<p>Many stream processing data flows require accessing data from or writing data to a relational data store. Storm 0.10.0 introduces highly flexible and customizable support for integrating with virtually any JDBC-compliant database.</p>
+<p>Many stream processing data flows require accessing data from or writing data to a relational data store. Apache Storm 0.10.0 introduces highly flexible and customizable support for integrating with virtually any JDBC-compliant database.</p>
 
-<p>The Storm-JDBC package includes core Storm bolt and Trident state implementations that allow a storm topology to either insert Storm tuple data into a database table or execute select queries against a database to enrich streaming data in a storm topology.</p>
+<p>The Storm-JDBC package includes core Apache Storm bolt and Trident state implementations that allow an Apache Storm topology to either insert Apache Storm tuple data into a database table or execute select queries against a database to enrich streaming data in an Apache Storm topology.</p>
 
 <p>Further details and instructions can be found in the <a href="https://github.com/apache/storm/blob/v0.10.0-beta/external/storm-jdbc/README.md">Storm-JDBC documentation</a>.</p>
 
 <h2 id="reduced-dependency-conflicts">Reduced Dependency Conflicts</h2>
 
-<p>In previous Storm releases, it was not uncommon for users&#39; topology dependencies to conflict with the libraries used by Storm. In Storm 0.9.3 several dependency packages that were common sources of conflicts have been package-relocated (shaded) to avoid this situation. In 0.10.0 this list has been expanded.</p>
+<p>In previous Apache Storm releases, it was not uncommon for users&#39; topology dependencies to conflict with the libraries used by Apache Storm. In Apache Storm 0.9.3 several dependency packages that were common sources of conflicts have been package-relocated (shaded) to avoid this situation. In 0.10.0 this list has been expanded.</p>
 
 <p>Developers are free to use the Storm-packaged versions, or supply their own version. </p>
 
-<p>The full list of Storm&#39;s package relocations can be found <a href="https://github.com/apache/storm/blob/v0.10.0-beta/storm-core/pom.xml#L439">here</a>.</p>
+<p>The full list of Apache Storm&#39;s package relocations can be found <a href="https://github.com/apache/storm/blob/v0.10.0-beta/storm-core/pom.xml#L439">here</a>.</p>
 
 <h2 id="future-work">Future Work</h2>
 
-<p>While the 0.10.0 release is an important milestone in the evolution of Apache Storm, the Storm community is actively working on new improvements, both near and long term, and continuously exploring the realm of the possible.</p>
+<p>While the 0.10.0 release is an important milestone in the evolution of Apache Storm, the Apache Storm community is actively working on new improvements, both near and long term, and continuously exploring the realm of the possible.</p>
 
-<p>Twitter recently announced the Heron project, which claims to provide substantial performance improvements while maintaining 100% API compatibility with Storm. The corresponding research paper provides additional details regarding the architectural improvements. The fact that Twitter chose to maintain API compatibility with Storm is a testament to the power and flexibility of that API. Twitter has also expressed a desire to share their experiences and work with the Apache Storm community.</p>
+<p>Twitter recently announced the Heron project, which claims to provide substantial performance improvements while maintaining 100% API compatibility with Apache Storm. The corresponding research paper provides additional details regarding the architectural improvements. The fact that Twitter chose to maintain API compatibility with Apache Storm is a testament to the power and flexibility of that API. Twitter has also expressed a desire to share their experiences and work with the Apache Storm community.</p>
 
-<p>A number of concepts expressed in the Heron paper were already in the implementation stage by the Storm community even before it was published, and we look forward to working with Twitter to bring those and other improvements to Storm.</p>
+<p>A number of concepts expressed in the Heron paper were already in the implementation stage by the Apache Storm community even before it was published, and we look forward to working with Twitter to bring those and other improvements to Apache Storm.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -547,8 +547,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -558,7 +558,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2015/11/05/storm0100-released.html b/content/2015/11/05/storm0100-released.html
index c842d5c..9eb8788 100644
--- a/content/2015/11/05/storm0100-released.html
+++ b/content/2015/11/05/storm0100-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.10.0 released</title>
+    <title>Apache Storm 0.10.0 released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.10.0 released
+                               Apache Storm 0.10.0 released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -310,8 +310,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -321,7 +321,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2015/11/05/storm096-released.html b/content/2015/11/05/storm096-released.html
index 7338930..493a9b9 100644
--- a/content/2015/11/05/storm096-released.html
+++ b/content/2015/11/05/storm096-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.9.6 released</title>
+    <title>Apache Storm 0.9.6 released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.9.6 released
+                               Apache Storm 0.9.6 released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 0.9.6 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -285,8 +285,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -296,7 +296,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2016/04/12/storm100-released.html b/content/2016/04/12/storm100-released.html
index fed3d78..b418113 100644
--- a/content/2016/04/12/storm100-released.html
+++ b/content/2016/04/12/storm100-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.0.0 released</title>
+    <title>Apache Storm 1.0.0 released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.0.0 released
+                               Apache Storm 1.0.0 released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -240,7 +240,7 @@
 
 <h2 id="pacemaker-heartbeat-server">Pacemaker - Heartbeat Server</h2>
 
-<p>Pacemaker is an optional Storm daemon designed to process heartbeats from workers. As Storm is scaled up, ZooKeeper begins to become a bottleneck due to high volumes of writes from workers doing heartbeats. Lots of writes to disk and large ammounts traffic across the network is generated as ZooKeeper tries to maintain consistency.</p>
+<p>Pacemaker is an optional Apache Storm daemon designed to process heartbeats from workers. As Apache Storm is scaled up, ZooKeeper begins to become a bottleneck due to high volumes of writes from workers doing heartbeats. Lots of writes to disk and large ammounts traffic across the network is generated as ZooKeeper tries to maintain consistency.</p>
 
 <p>Because heartbeats are of an ephemeral nature, they do not need to be persisted to disk or synced across nodes, and an in-memory store will do. This is the role of Pacemaker. Pacemaker functions as a simple in-memory key/value store with ZooKeeper-like, directory-style keys and byte array values.</p>
 
@@ -248,15 +248,15 @@
 
 <p>In the past it was common for developers to bundle resources required by a topology (such as lookup data, machine learning models, etc.) within a topology jar file. One problem with this approach is that updating that data required the repackaging and redeployment of the topology. Another problem is that at times that data can be very large (gigabytes or more), which negatively impacts topology startup time. </p>
 
-<p>Storm version 1.0 introduces a distributed cache API that allows for the sharing of files (BLOBs) among topologies. Files in the distributed cache can be updated at any time from the command line, without the need to redeploy a topology. The distributed cache API allows for files from several KB in size to several GB, and also supports compression formats such as ZIP and GZIP.</p>
+<p>Apache Storm version 1.0 introduces a distributed cache API that allows for the sharing of files (BLOBs) among topologies. Files in the distributed cache can be updated at any time from the command line, without the need to redeploy a topology. The distributed cache API allows for files from several KB in size to several GB, and also supports compression formats such as ZIP and GZIP.</p>
 
-<p>Storm 1.0 comes with two implementations of the distributed cache API: One backed by the local file system on Supervisor nodes, and one backed by Apache Hadoop HDFS. Both implementations also support fine-grained access control through ACLs.</p>
+<p>Apache Storm 1.0 comes with two implementations of the distributed cache API: One backed by the local file system on Supervisor nodes, and one backed by Apache Hadoop HDFS. Both implementations also support fine-grained access control through ACLs.</p>
 
 <h2 id="ha-nimbus">HA Nimbus</h2>
 
-<p>Experienced Storm users will recognize that the Storm Nimbus service is not a single point of failure in the strictest sense (i.e. loss of the Nimbus node will not affect running topologies). However, the loss of the Nimbus node does degrade functionality for deploying new topologies and reassigning work across a cluster.</p>
+<p>Experienced Apache Storm users will recognize that the Apache Storm Nimbus service is not a single point of failure in the strictest sense (i.e. loss of the Nimbus node will not affect running topologies). However, the loss of the Nimbus node does degrade functionality for deploying new topologies and reassigning work across a cluster.</p>
 
-<p>In Storm 1.0 this “soft” point of failure has been eliminated by supporting an HA Nimbus. Multiple instances of the Nimbus service run in a cluster and perform leader election when a Nimbus node fails, and Nimbus hosts can join or leave the cluster at any time. HA Nimbus leverages the distributed cache API for replication to guarantee the availability of topology resources in the event of a Nimbus node failure.</p>
+<p>In Apache Storm 1.0 this “soft” point of failure has been eliminated by supporting an HA Nimbus. Multiple instances of the Nimbus service run in a cluster and perform leader election when a Nimbus node fails, and Nimbus hosts can join or leave the cluster at any time. HA Nimbus leverages the distributed cache API for replication to guarantee the availability of topology resources in the event of a Nimbus node failure.</p>
 
 <h2 id="native-streaming-window-api">Native Streaming Window API</h2>
 
@@ -264,7 +264,7 @@
 
 <p>Windowing is primarily used for aggregations, joins, pattern matching and more. Windows can be seen as an in-memory table where events are added and evicted based on some policies.</p>
 
-<p>In past releases Storm relied on developers to build their own windowing logic. There were no recommended or high level abstractions that developers could use to define a Window in a standard way in a Topology.</p>
+<p>In past releases Apache Storm relied on developers to build their own windowing logic. There were no recommended or high level abstractions that developers could use to define a Window in a standard way in a Topology.</p>
 
 <p>Apache Storm 1.0 now includes a native windowing API. Windows can be specified with the following two parameters,</p>
 
@@ -273,45 +273,45 @@
 <li>Sliding interval - the interval at which the window slides</li>
 </ol>
 
-<p>Storm has support for sliding and tumbling windows based on time duration and/or event count.</p>
+<p>Apache Storm has support for sliding and tumbling windows based on time duration and/or event count.</p>
 
 <h2 id="state-management-statefule-bolts-with-automatic-checkpointing">State Management - Statefule Bolts with Automatic Checkpointing</h2>
 
-<p>Storm 1.0 introduces a new Stateful Bolt API with automatic checkpointing. Stateful Bolts are easy to implement -- simply extend the <code>BaseStatefulBolt</code> class -- and can be combined with stateless bolts in a topology. Storm will automatically manage bolt state and recover that state in the event of a failure.</p>
+<p>Apache Storm 1.0 introduces a new Stateful Bolt API with automatic checkpointing. Stateful Bolts are easy to implement -- simply extend the <code>BaseStatefulBolt</code> class -- and can be combined with stateless bolts in a topology. Apache Storm will automatically manage bolt state and recover that state in the event of a failure.</p>
 
-<p>Storm 1.0 comes with a state implementations backed by memory as well as Redis. Future point releases will include additional support for alternative state stores.</p>
+<p>Apache Storm 1.0 comes with a state implementations backed by memory as well as Redis. Future point releases will include additional support for alternative state stores.</p>
 
 <h2 id="automatic-backpressure">Automatic Backpressure</h2>
 
-<p>In previous Storm versions, the only way to throttle the input to a topology was to enable ACKing and set <code>topology.max.spout.pending</code>. For use cases that don&#39;t require at-least-once processing guarantees, this requirement imposed a significant performance penalty.</p>
+<p>In previous Apache Storm versions, the only way to throttle the input to a topology was to enable ACKing and set <code>topology.max.spout.pending</code>. For use cases that don&#39;t require at-least-once processing guarantees, this requirement imposed a significant performance penalty.</p>
 
-<p>Storm 1.0 includes a new automatic backpressure mechanism based on configurable high/low watermarks expressed as a percentage of a task&#39;s buffer size. If the high water mark is reached, Storm will slow down the topology&#39;s spouts and stop throttling when the low water mark is reached.</p>
+<p>Apache Storm 1.0 includes a new automatic backpressure mechanism based on configurable high/low watermarks expressed as a percentage of a task&#39;s buffer size. If the high water mark is reached, Apache Storm will slow down the topology&#39;s spouts and stop throttling when the low water mark is reached.</p>
 
-<p>Storm&#39;s backpressure mechanism is implemented independently of the Spout API, so all existing Spouts are supported.</p>
+<p>Apache Storm&#39;s backpressure mechanism is implemented independently of the Spout API, so all existing Spouts are supported.</p>
 
 <h2 id="resource-aware-scheduler">Resource Aware Scheduler</h2>
 
-<p>Based on Storm pluggable topology scheduler API, Storm 1.0 adds a new scheduler implementation that takes into account both the memory (on-heap and off-heap) and CPU resources available in a cluster. The resources aware scheduler (AKA &quot;RAS Scheduler&quot;) allows users to specify the memory and CPU requirements for individual topology components (Spouts/Bolts), and Storm will schedule topology tasks among workers to best meet those requirements.</p>
+<p>Based on Apache Storm pluggable topology scheduler API, Apache Storm 1.0 adds a new scheduler implementation that takes into account both the memory (on-heap and off-heap) and CPU resources available in a cluster. The resources aware scheduler (AKA &quot;RAS Scheduler&quot;) allows users to specify the memory and CPU requirements for individual topology components (Spouts/Bolts), and Apache Storm will schedule topology tasks among workers to best meet those requirements.</p>
 
-<p>In the future, the Storm community plans to extend the RAS implmentation to support network resources and rack awareness as well.</p>
+<p>In the future, the Apache Storm community plans to extend the RAS implmentation to support network resources and rack awareness as well.</p>
 
 <h2 id="dynamic-log-levels">Dynamic Log Levels</h2>
 
-<p>Storm 1.0 now allows users and administrators to dynamically change the log level settings for a running topology both from the Storm UI as well as the command line. Users can also specify an optional timeout after which those changes will be automatically reverted. The resulting log files are also easily searchable from the Storm UI and logviewer service.</p>
+<p>Apache Storm 1.0 now allows users and administrators to dynamically change the log level settings for a running topology both from the Apache Storm UI as well as the command line. Users can also specify an optional timeout after which those changes will be automatically reverted. The resulting log files are also easily searchable from the Apache Storm UI and logviewer service.</p>
 
 <h2 id="tuple-sampling-and-debugging">Tuple Sampling and Debugging</h2>
 
-<p>In the course of debugging a topology, many Storm users find themselves adding &quot;debug&quot; bolts or Trident functions to log information about the data flowing through the topology, only to remove or disable them for production deployment. Storm 1.0 eliminates this need through the new Topology Debug capability.</p>
+<p>In the course of debugging a topology, many Apache Storm users find themselves adding &quot;debug&quot; bolts or Trident functions to log information about the data flowing through the topology, only to remove or disable them for production deployment. Apache Storm 1.0 eliminates this need through the new Topology Debug capability.</p>
 
-<p>Storm UI now includes a function that allow you to sample a percentage tuples flowing through a topology or individual component directly from the Storm UI. The sampled events can then be viewed directly from the Storm UI and are also saved to disk.</p>
+<p>Apache Storm UI now includes a function that allow you to sample a percentage tuples flowing through a topology or individual component directly from the Apache Storm UI. The sampled events can then be viewed directly from the Apache Storm UI and are also saved to disk.</p>
 
 <h2 id="distributed-log-search">Distributed Log Search</h2>
 
-<p>Another improvement to Storm&#39;s UI is the addition of a distributed log search. This search capability allows users to search across all log files of a specific topology, including archived (ZIP&#39;ed) logs. The search results will include matches from all Supervisor nodes.</p>
+<p>Another improvement to Apache Storm&#39;s UI is the addition of a distributed log search. This search capability allows users to search across all log files of a specific topology, including archived (ZIP&#39;ed) logs. The search results will include matches from all Supervisor nodes.</p>
 
 <h2 id="dynamic-worker-profiling">Dynamic Worker Profiling</h2>
 
-<p>The last, but certainly not the least, usability improvement in Storm 1.0 is dynamic worker profiling. This new feature allows users to request worker profile data directly from Storm UI, including:</p>
+<p>The last, but certainly not the least, usability improvement in Apache Storm 1.0 is dynamic worker profiling. This new feature allows users to request worker profile data directly from Apache Storm UI, including:</p>
 
 <ul>
 <li>Heap Dumps</li>
@@ -319,7 +319,7 @@
 <li>JProfile Recordings</li>
 </ul>
 
-<p>The generated files are then available for download for off-line analysis with various debugging tools. It is also now possible to restart workers from the Storm UI.</p>
+<p>The generated files are then available for download for off-line analysis with various debugging tools. It is also now possible to restart workers from the Apache Storm UI.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -677,8 +677,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -688,7 +688,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2016/05/05/storm0101-released.html b/content/2016/05/05/storm0101-released.html
index fa96cef..5dcbc81 100644
--- a/content/2016/05/05/storm0101-released.html
+++ b/content/2016/05/05/storm0101-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.10.1 Released</title>
+    <title>Apache Storm 0.10.1 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.10.1 Released
+                               Apache Storm 0.10.1 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 0.10.1 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -285,8 +285,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -296,7 +296,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2016/05/06/storm101-released.html b/content/2016/05/06/storm101-released.html
index b6f9853..ed5ad14 100644
--- a/content/2016/05/06/storm101-released.html
+++ b/content/2016/05/06/storm101-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.0.1 Released</title>
+    <title>Apache Storm 1.0.1 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.0.1 Released
+                               Apache Storm 1.0.1 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,11 +232,11 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.0.1 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="performance-improvements">Performance Improvements</h2>
 
-<p>This release includes performance improvements to Storm&#39;s internal messaging system. The maximum rate at which spouts can emit data has nearly doubled, and performance of inter-task communication has improved.</p>
+<p>This release includes performance improvements to Apache Storm&#39;s internal messaging system. The maximum rate at which spouts can emit data has nearly doubled, and performance of inter-task communication has improved.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -301,8 +301,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -312,7 +312,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2016/08/10/storm102-released.html b/content/2016/08/10/storm102-released.html
index af62743..3a8995d 100644
--- a/content/2016/08/10/storm102-released.html
+++ b/content/2016/08/10/storm102-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.0.2 Released</title>
+    <title>Apache Storm 1.0.2 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.0.2 Released
+                               Apache Storm 1.0.2 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.0.2 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -325,8 +325,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -336,7 +336,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2016/09/07/storm097-released.html b/content/2016/09/07/storm097-released.html
index 7f388b3..9153ff7 100644
--- a/content/2016/09/07/storm097-released.html
+++ b/content/2016/09/07/storm097-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.9.7 Released</title>
+    <title>Apache Storm 0.9.7 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.9.7 Released
+                               Apache Storm 0.9.7 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,11 +232,11 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 0.9.7 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="multi-lang-bug-fix">Multi-Lang Bug Fix</h2>
 
-<p>This release fixes an issue with Storm&#39;s multi-lang feature where a malformed multi-lang message from a ShellSpout would cause the spout to hang indefinitely.</p>
+<p>This release fixes an issue with Apache Storm&#39;s multi-lang feature where a malformed multi-lang message from a ShellSpout would cause the spout to hang indefinitely.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -281,8 +281,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -292,7 +292,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2016/09/14/storm0102-released.html b/content/2016/09/14/storm0102-released.html
index d7e8f94..e7c3cbd 100644
--- a/content/2016/09/14/storm0102-released.html
+++ b/content/2016/09/14/storm0102-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 0.10.2 Released</title>
+    <title>Apache Storm 0.10.2 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 0.10.2 Released
+                               Apache Storm 0.10.2 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 0.10.2 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -284,8 +284,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -295,7 +295,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2017/02/14/storm103-released.html b/content/2017/02/14/storm103-released.html
index aaceb81..4f5b6d9 100644
--- a/content/2017/02/14/storm103-released.html
+++ b/content/2017/02/14/storm103-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.0.3 Released</title>
+    <title>Apache Storm 1.0.3 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.0.3 Released
+                               Apache Storm 1.0.3 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.0.3 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -336,8 +336,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -347,7 +347,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2017/03/29/storm110-released.html b/content/2017/03/29/storm110-released.html
index ebfc8b0..612ac82 100644
--- a/content/2017/03/29/storm110-released.html
+++ b/content/2017/03/29/storm110-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.1.0 released</title>
+    <title>Apache Storm 1.1.0 released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.1.0 released
+                               Apache Storm 1.1.0 released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -236,9 +236,9 @@
 
 <h2 id="streaming-sql">Streaming SQL</h2>
 
-<p>Storm 1.1.0 supports native Streaming SQL, powered by <a href="http://calcite.apache.org">Apache Calcite</a>, that allows users to run SQL queries over streaming data as well update external systems and data stores such as <a href="http://hive.apache.org">Apache Hive</a>. To deploy an SQL-based topology users define the SQL query in a text file and use the <code>storm sql</code> command to submit the resulting topology to a Storm cluster. Behind the scenes Storm will compile the SQL into a Trident topology and run it on the cluster.</p>
+<p>Apache Storm 1.1.0 supports native Streaming SQL, powered by <a href="http://calcite.apache.org">Apache Calcite</a>, that allows users to run SQL queries over streaming data as well update external systems and data stores such as <a href="http://hive.apache.org">Apache Hive</a>. To deploy an SQL-based topology users define the SQL query in a text file and use the <code>storm sql</code> command to submit the resulting topology to an Apache Storm cluster. Behind the scenes Apache Storm will compile the SQL into a Trident topology and run it on the cluster.</p>
 
-<p>Storm&#39;s SQL support includes the following features:</p>
+<p>Apache Storm&#39;s SQL support includes the following features:</p>
 
 <ul>
 <li>Streaming from/to external sources including Apache Kafka, HDFS, MongoDB, and Redis</li>
@@ -250,7 +250,7 @@
 <li>Extensibility to additional data sources via the <code>ISqlTridentDataSource</code> interface</li>
 </ul>
 
-<p>For more information about Storm&#39;s SQL support including examples, refer to the following resources:</p>
+<p>For more information about Apache Storm&#39;s SQL support including examples, refer to the following resources:</p>
 
 <ul>
 <li><a href="/releases/1.1.0/storm-sql.html">Storm SQL Overview</a></li>
@@ -260,7 +260,7 @@
 
 <h2 id="apache-kafka-integration-improvements">Apache Kafka Integration Improvements</h2>
 
-<p>In addition to the traditional support for Kafka version 0.8/0.9 based on the Kafka simple consumer, Storm includes support for Kafka 0.10 and later based on the new Kafka consumer API. Storm&#39;s integration with Kafka 0.10 and later version is highly flexible and extensible, some of the features include:</p>
+<p>In addition to the traditional support for Kafka version 0.8/0.9 based on the Kafka simple consumer, Apache Storm includes support for Kafka 0.10 and later based on the new Kafka consumer API. Apache Storm&#39;s integration with Kafka 0.10 and later version is highly flexible and extensible, some of the features include:</p>
 
 <ul>
 <li>Enhanced configuration API</li>
@@ -273,7 +273,7 @@
 <li>Kafka security support</li>
 </ul>
 
-<p>For more information on Storm&#39;s Kafka integration please refer to the following documentation:</p>
+<p>For more information on Apache Storm&#39;s Kafka integration please refer to the following documentation:</p>
 
 <ul>
 <li><a href="/releases/1.1.0/storm-kafka-client.html">Kafka Integration (0.10 and later)</a></li>
@@ -282,37 +282,37 @@
 
 <h2 id="pmml-predictive-model-markup-language-support">PMML (Predictive Model Markup Language) Support</h2>
 
-<p>In order to better support machine learning use cases, Storm now includes support for executing PMML models in topoliges via a generic PMML bolt. The <code>PMMLPredictorBolt</code> allows users to specify a model, the raw input, and the resulting streams and output fields. At runtime the bolt will process incoming raw data, execute the model with the given input, and output tuples with scores for predicted fields and output fields.</p>
+<p>In order to better support machine learning use cases, Apache Storm now includes support for executing PMML models in topoliges via a generic PMML bolt. The <code>PMMLPredictorBolt</code> allows users to specify a model, the raw input, and the resulting streams and output fields. At runtime the bolt will process incoming raw data, execute the model with the given input, and output tuples with scores for predicted fields and output fields.</p>
 
-<p>More information on Storm&#39;s PMML support can be found <a href="https://github.com/apache/storm/blob/v1.1.0/external/storm-pmml/README.md">here</a>.</p>
+<p>More information on Apache Storm&#39;s PMML support can be found <a href="https://github.com/apache/storm/blob/v1.1.0/external/storm-pmml/README.md">here</a>.</p>
 
 <h2 id="druid-integration">Druid Integration</h2>
 
-<p><a href="http://druid.io">Druid</a> is a scalable, high-performance, column oriented, distributed data store popular for real time analytics use cases. Storm 1.1.0 introduces a Storm bolt and Trident state implementations for streaming data into a Druid data store.</p>
+<p><a href="http://druid.io">Druid</a> is a scalable, high-performance, column oriented, distributed data store popular for real time analytics use cases. Apache Storm 1.1.0 introduces a Apache Storm bolt and Trident state implementations for streaming data into a Druid data store.</p>
 
-<p>Documentation for Storm&#39;s Druid integration can be found <a href="https://github.com/apache/storm/blob/v1.1.0/external/storm-druid/README.md">here</a>.</p>
+<p>Documentation for Apache Storm&#39;s Druid integration can be found <a href="https://github.com/apache/storm/blob/v1.1.0/external/storm-druid/README.md">here</a>.</p>
 
 <h2 id="opentsdb-integration">OpenTSDB Integration</h2>
 
-<p><a href="http://opentsdb.net">OpenTSDB</a> is a highly scalable time series database based on Apache HBase. Storm 1.1.0 adds a Storm bolt and Trident state implementations for writing data to OpenTSDB. Storm&#39;s OpenTSDB integration gives users fine-grained control over how Storm tuples map to OpenTSDB data structure by providing a simple interface (<code>ITupleOpenTsdbDatapointMapper</code>) that performs the translation.</p>
+<p><a href="http://opentsdb.net">OpenTSDB</a> is a highly scalable time series database based on Apache HBase. Apache Storm 1.1.0 adds an Apache Storm bolt and Trident state implementations for writing data to OpenTSDB. Apache Storm&#39;s OpenTSDB integration gives users fine-grained control over how Apache Storm tuples map to OpenTSDB data structure by providing a simple interface (<code>ITupleOpenTsdbDatapointMapper</code>) that performs the translation.</p>
 
-<p>Move information about Storm&#39;s OpenTSDB integration can be found <a href="https://github.com/apache/storm/blob/v1.1.0/external/storm-opentsdb/README.md">here</a>.</p>
+<p>Move information about Apache Storm&#39;s OpenTSDB integration can be found <a href="https://github.com/apache/storm/blob/v1.1.0/external/storm-opentsdb/README.md">here</a>.</p>
 
 <h2 id="aws-kinesis-support">AWS Kinesis Support</h2>
 
-<p>For users looking to integrate with Amazon&#39;s Kinesis service, Storm 1.1.0 now includes a spout for consuming message streams from Kinesis. Like most of Storm&#39;s external system integration components, the Kinesis spout provides a simple interface (<code>RecordToTupleMapper</code>)for controlling how Kinesis messages are translated to Storm tuples. The Kinesis spout provides an additional interface (<code>FailedMessageRetryHandler</code>) that allows users to customize the Spout&#39;s failure handling logic.</p>
+<p>For users looking to integrate with Amazon&#39;s Kinesis service, Apache Storm 1.1.0 now includes a spout for consuming message streams from Kinesis. Like most of Apache Storm&#39;s external system integration components, the Kinesis spout provides a simple interface (<code>RecordToTupleMapper</code>)for controlling how Kinesis messages are translated to Apache Storm tuples. The Kinesis spout provides an additional interface (<code>FailedMessageRetryHandler</code>) that allows users to customize the Spout&#39;s failure handling logic.</p>
 
 <p>Documentation for the Kinesis spout can be found <a href="https://github.com/apache/storm/blob/v1.1.0/external/storm-kinesis/README.md">here</a>.</p>
 
 <h2 id="hdfs-spout">HDFS Spout</h2>
 
-<p>Storm&#39;s HDFS integration now includes a spout that continuously streams data from the HDFS filesystem. Storm&#39;s HDFS spout monitors a configurable directory for new files and feeds that data into a topology. When the spout has completed processing a file, it will be moved to the configured archive directory. In the event a file is corrupt or is otherwise not processable, the corresponding file will be moved to a specific directory. Parallelism of the spout is made possible through a locking mechanism that ensures each file is &quot;owned&quot; by a single spout instance. The HDFS spout supports connecting to HDFS instances that are secured with Kerberos authentication.</p>
+<p>Apache Storm&#39;s HDFS integration now includes a spout that continuously streams data from the HDFS filesystem. Apache Storm&#39;s HDFS spout monitors a configurable directory for new files and feeds that data into a topology. When the spout has completed processing a file, it will be moved to the configured archive directory. In the event a file is corrupt or is otherwise not processable, the corresponding file will be moved to a specific directory. Parallelism of the spout is made possible through a locking mechanism that ensures each file is &quot;owned&quot; by a single spout instance. The HDFS spout supports connecting to HDFS instances that are secured with Kerberos authentication.</p>
 
-<p>More information on using the HDFS spout can be found in the <a href="https://github.com/apache/storm/blob/v1.1.0/external/storm-hdfs/README.md">Storm HDFS Documentation</a></p>
+<p>More information on using the HDFS spout can be found in the <a href="https://github.com/apache/storm/blob/v1.1.0/external/storm-hdfs/README.md">Apache Storm HDFS Documentation</a></p>
 
 <h2 id="flux-improvements">Flux Improvements</h2>
 
-<p>Flux is a framework and set of utilities that allow users to declaratively define Storm topologies and avoid hard-coding configuration values in topology components. Storm 1.1.0 introduces the following enhancements to the Flux framework:</p>
+<p>Flux is a framework and set of utilities that allow users to declaratively define Apache Storm topologies and avoid hard-coding configuration values in topology components. Apache Storm 1.1.0 introduces the following enhancements to the Flux framework:</p>
 
 <ul>
 <li>Flux topology visualization in Storm UI</li>
@@ -325,13 +325,13 @@
 
 <h2 id="topology-deployment-enhancements">Topology Deployment Enhancements</h2>
 
-<p>In previous versions of Storm it was typically necessary to include all topology dependences in a shaded &quot;uber jar,&quot; or by making them available on Storm&#39;s classpath. In Storm 1.1.0 the <code>storm jar</code> command now includes options to upload additional dependency jars during topology submission. The <code>--jars</code> command line option allows users to specify local jar files to upload. Alternatively, the <code>storm jar</code> command offers the <code>--artifacts</code> option for specifying additional jar file dependencies by their Maven coordinates. Finally, for Maven artifacts outside the Maven Central, the <code>--artifactRepository</code> option allows users to specify additional repositories for dependency resolution.</p>
+<p>In previous versions of Apache Storm it was typically necessary to include all topology dependences in a shaded &quot;uber jar,&quot; or by making them available on Apache Storm&#39;s classpath. In Apache Storm 1.1.0 the <code>storm jar</code> command now includes options to upload additional dependency jars during topology submission. The <code>--jars</code> command line option allows users to specify local jar files to upload. Alternatively, the <code>storm jar</code> command offers the <code>--artifacts</code> option for specifying additional jar file dependencies by their Maven coordinates. Finally, for Maven artifacts outside the Maven Central, the <code>--artifactRepository</code> option allows users to specify additional repositories for dependency resolution.</p>
 
 <p>More informaton about available options of the <code>storm jar</code> command can be found by runnng the <code>storm help jar</code> command.</p>
 
 <h2 id="resource-aware-scheduler-ras-improvements">Resource Aware Scheduler (RAS) Improvements</h2>
 
-<p>The Resource Aware Scheduler introduced in Storm 1.0 added a scheduler implementation that takes into account both the memory (on-heap and off-heap) and CPU resources available in a cluster. In Storm 1.1.0 the RAS algorithm has been overhauled to dramatically improve cluster resource utilization and introduces rack awareness into the scheduling strategy.</p>
+<p>The Resource Aware Scheduler introduced in Apache Storm 1.0 added a scheduler implementation that takes into account both the memory (on-heap and off-heap) and CPU resources available in a cluster. In Apache Storm 1.1.0 the RAS algorithm has been overhauled to dramatically improve cluster resource utilization and introduces rack awareness into the scheduling strategy.</p>
 
 <p>More information on the new RAS capabilities can be found in the <a href="/releases/1.1.0/Resource_Aware_Scheduler_overview.html">RAS documentation</a> and the <a href="https://issues.apache.org/jira/browse/STORM-1766">JIRA ticket</a> introducing the new rack awareness algorithm.</p>
 
@@ -595,8 +595,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -606,7 +606,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2017/07/28/storm104-released.html b/content/2017/07/28/storm104-released.html
index 2a9391c..da55b30 100644
--- a/content/2017/07/28/storm104-released.html
+++ b/content/2017/07/28/storm104-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.0.4 Released</title>
+    <title>Apache Storm 1.0.4 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.0.4 Released
+                               Apache Storm 1.0.4 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.0.4 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -304,8 +304,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -315,7 +315,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2017/08/01/storm111-released.html b/content/2017/08/01/storm111-released.html
index ab2e01a..843a3e8 100644
--- a/content/2017/08/01/storm111-released.html
+++ b/content/2017/08/01/storm111-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.1.1 Released</title>
+    <title>Apache Storm 1.1.1 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.1.1 Released
+                               Apache Storm 1.1.1 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.1.1 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -320,8 +320,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -331,7 +331,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2017/09/15/storm105-released.html b/content/2017/09/15/storm105-released.html
index 0458f6f..058c5ef 100644
--- a/content/2017/09/15/storm105-released.html
+++ b/content/2017/09/15/storm105-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.0.5 Released</title>
+    <title>Apache Storm 1.0.5 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.0.5 Released
+                               Apache Storm 1.0.5 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.0.5 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -290,8 +290,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -301,7 +301,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2018/02/14/storm106-released.html b/content/2018/02/14/storm106-released.html
index 4024a5c..6c9c7d3 100644
--- a/content/2018/02/14/storm106-released.html
+++ b/content/2018/02/14/storm106-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.0.6 Released</title>
+    <title>Apache Storm 1.0.6 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.0.6 Released
+                               Apache Storm 1.0.6 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,11 +232,11 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.0.5 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="apache-kafka-integration-improvements">Apache Kafka Integration Improvements</h2>
 
-<p>This release includes many improvements to Storm&#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
+<p>This release includes many improvements to Apache Storm&#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
 <a href="/releases/1.0.6/storm-kafka-client.html">Kafka client documentation</a></p>
 
 <h2 id="thanks">Thanks</h2>
@@ -319,8 +319,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -330,7 +330,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2018/02/15/storm112-released.html b/content/2018/02/15/storm112-released.html
index 9c6ba37..70fe261 100644
--- a/content/2018/02/15/storm112-released.html
+++ b/content/2018/02/15/storm112-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.1.2 Released</title>
+    <title>Apache Storm 1.1.2 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.1.2 Released
+                               Apache Storm 1.1.2 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,11 +232,11 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.1.2 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="apache-kafka-integration-improvements">Apache Kafka Integration Improvements</h2>
 
-<p>This release includes many improvements to Storm&#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
+<p>This release includes many improvements to Apache Storm&#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
 <a href="/releases/1.1.2/storm-kafka-client.html">Kafka client documentation</a></p>
 
 <h2 id="thanks">Thanks</h2>
@@ -355,8 +355,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -366,7 +366,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2018/02/15/storm120-released.html b/content/2018/02/15/storm120-released.html
index 7e73728..9afc807 100644
--- a/content/2018/02/15/storm120-released.html
+++ b/content/2018/02/15/storm120-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.2.0 Released</title>
+    <title>Apache Storm 1.2.0 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.2.0 Released
+                               Apache Storm 1.2.0 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -234,12 +234,12 @@
 
 <h2 id="apache-kafka-integration-improvements">Apache Kafka Integration Improvements</h2>
 
-<p>This release includes many improvements to Storm&#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
+<p>This release includes many improvements to Apache Storm&#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
 <a href="/releases/1.2.0/storm-kafka-client.html">Kafka client documentation</a></p>
 
 <h2 id="new-metrics-reporting-api">New Metrics Reporting API</h2>
 
-<p>This release introduces a new metrics system for reporting internal statistics (e.g. acked, failed, emitted, transferred, disruptor queue metrics, etc.) as well as a new API for user defined metrics based on the popular <a href="">Dropwizard Metrics library</a>. Storm includes reporters for gathering metrics data with Ganglia, Graphite, JMX, CSV and the console. Additional metrics systems can be integrated by extending the <code>org.apache.storm.metrics2.reporters.ScheduledStormReporter</code> class. Additional details can be found in the <a href="/releases/1.2.0/metrics_v2.html">metrics documentation</a>.</p>
+<p>This release introduces a new metrics system for reporting internal statistics (e.g. acked, failed, emitted, transferred, disruptor queue metrics, etc.) as well as a new API for user defined metrics based on the popular <a href="">Dropwizard Metrics library</a>. Apache Storm includes reporters for gathering metrics data with Ganglia, Graphite, JMX, CSV and the console. Additional metrics systems can be integrated by extending the <code>org.apache.storm.metrics2.reporters.ScheduledStormReporter</code> class. Additional details can be found in the <a href="/releases/1.2.0/metrics_v2.html">metrics documentation</a>.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -478,8 +478,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -489,7 +489,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2018/02/19/storm121-released.html b/content/2018/02/19/storm121-released.html
index 7928d96..599d5cb 100644
--- a/content/2018/02/19/storm121-released.html
+++ b/content/2018/02/19/storm121-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.2.1 Released</title>
+    <title>Apache Storm 1.2.1 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.2.1 Released
+                               Apache Storm 1.2.1 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,11 +232,11 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.2.1 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <p>In the 1.2.0 release, an LGPL-licensed binary dependency was inadvertently included. The 1.2.0 has since been removed from distribution.</p>
 
-<p>The dependency in question (Remote Tea Runtime) is required when using the Ganglia reporter for the new metrics system. To enable the Ganglia reporter you will need to download the following <a href="http://central.maven.org/maven2/org/acplt/oncrpc/1.0.7/oncrpc-1.0.7.jar">jar</a> and place it in the <code>lib</code> directory of the Storm installation.</p>
+<p>The dependency in question (Remote Tea Runtime) is required when using the Ganglia reporter for the new metrics system. To enable the Ganglia reporter you will need to download the following <a href="http://central.maven.org/maven2/org/acplt/oncrpc/1.0.7/oncrpc-1.0.7.jar">jar</a> and place it in the <code>lib</code> directory of the Apache Storm installation.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -288,8 +288,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -299,7 +299,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2018/06/04/storm113-released.html b/content/2018/06/04/storm113-released.html
index d818222..f6e2019 100644
--- a/content/2018/06/04/storm113-released.html
+++ b/content/2018/06/04/storm113-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.1.3 Released</title>
+    <title>Apache Storm 1.1.3 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.1.3 Released
+                               Apache Storm 1.1.3 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.1.3 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -324,8 +324,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -335,7 +335,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2018/06/04/storm122-released.html b/content/2018/06/04/storm122-released.html
index be6f51a..5e3073e 100644
--- a/content/2018/06/04/storm122-released.html
+++ b/content/2018/06/04/storm122-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.2.2 Released</title>
+    <title>Apache Storm 1.2.2 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.2.2 Released
+                               Apache Storm 1.2.2 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.2.2 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -324,8 +324,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -335,7 +335,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2019/05/30/storm200-released.html b/content/2019/05/30/storm200-released.html
index 0f5c4d6..9b242f7 100644
--- a/content/2019/05/30/storm200-released.html
+++ b/content/2019/05/30/storm200-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 2.0.0 Released</title>
+    <title>Apache Storm 2.0.0 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 2.0.0 Released
+                               Apache Storm 2.0.0 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -238,21 +238,21 @@
 
 <h2 id="new-architecture-implemented-in-java">New Architecture Implemented in Java</h2>
 
-<p>In previous releases a large part of Storm&#39;s core functionality was implemented in Clojure. Storm 2.0.0 has been rearchitected with it&#39;s core functionality implemented in pure Java. The new Java-based implementation has improved performance significantly, and made Storm&#39;s internal APIs more maintainable and extensible. While Storm&#39;s Clojure implementation served it well for many years, it was often cited as a barrier for entry to new contributors. Storm&#39;s codebase is now more accessible to developers who don&#39;t want to learn Clojure in order to contribute.</p>
+<p>In previous releases a large part of Apache Storm&#39;s core functionality was implemented in Clojure. Apache Storm 2.0.0 has been rearchitected with it&#39;s core functionality implemented in pure Java. The new Java-based implementation has improved performance significantly, and made Apache Storm&#39;s internal APIs more maintainable and extensible. While Apache Storm&#39;s Clojure implementation served it well for many years, it was often cited as a barrier for entry to new contributors. Apache Storm&#39;s codebase is now more accessible to developers who don&#39;t want to learn Clojure in order to contribute.</p>
 
 <h2 id="new-high-performance-core">New High Performance Core:</h2>
 
-<p>Storm 2.0.0 introduces a new core featuring a leaner threading model, a blazing fast messaging subsystem and a lightweight back pressure model. It is designed to push boundaries on throughput, latency and energy consumption while maintaining backward compatibility. The design was motivated by the observation that existing hardware remains capable of much more than what the best streaming engines can deliver. Storm 2.0 is the first streaming engine to break the 1 microsecond latency barrier.</p>
+<p>Apache Storm 2.0.0 introduces a new core featuring a leaner threading model, a blazing fast messaging subsystem and a lightweight back pressure model. It is designed to push boundaries on throughput, latency and energy consumption while maintaining backward compatibility. The design was motivated by the observation that existing hardware remains capable of much more than what the best streaming engines can deliver. Apache Storm 2.0 is the first streaming engine to break the 1 microsecond latency barrier.</p>
 
 <h2 id="new-streams-api">New Streams API</h2>
 
-<p>Storm 2.0.0 introduces a new typed API for expressing streaming computations more easily using functional style operations. It builds on top of the Storm&#39;s core spouts and bolt APIs and automatically fuses multiple operations together to optimize the pipeline.</p>
+<p>Apache Storm 2.0.0 introduces a new typed API for expressing streaming computations more easily using functional style operations. It builds on top of the Apache Storm&#39;s core spouts and bolt APIs and automatically fuses multiple operations together to optimize the pipeline.</p>
 
 <p>For more details and examples see the <a href="https://github.com/apache/storm/blob/master/docs/Stream-API.md">Stream API documentation</a>.</p>
 
 <h2 id="windowing-enhancements">Windowing Enhancements</h2>
 
-<p>Storm 2.0.0&#39;s Windowing API can save/restore the window state to the configured state backend so that larger continuous windows can be supported. The window boundaries can now be accessed via the APIs.</p>
+<p>Apache Storm 2.0.0&#39;s Windowing API can save/restore the window state to the configured state backend so that larger continuous windows can be supported. The window boundaries can now be accessed via the APIs.</p>
 
 <p>For more details see <a href="https://github.com/apache/storm/blob/master/docs/Windowing.md#stateful-windowing">stateful windowing documentation</a>.</p>
 
@@ -260,15 +260,15 @@
 
 <h3 id="removal-of-storm-kafka">Removal of Storm-Kafka</h3>
 
-<p>The most significant change to Storm&#39;s Kafka integration since 1.x, is that storm-kafka has been removed. The module was deprecated a while back, due to Kafka&#39;s deprecation of the underlying client library. Users will have to move to the storm-kafka-client module, which uses Kafka&#39;s ´kafka-clients´ library for integration.</p>
+<p>The most significant change to Apache Storm&#39;s Kafka integration since 1.x, is that storm-kafka has been removed. The module was deprecated a while back, due to Kafka&#39;s deprecation of the underlying client library. Users will have to move to the storm-kafka-client module, which uses Kafka&#39;s ´kafka-clients´ library for integration.</p>
 
-<p>For the most part, the migration to storm-kafka-client is straightforward. The documentation for storm-kafka-client contains a helpful mapping between the old and new spout configurations. If you are using any of the storm-kafka spouts, you will need to migrate offset checkpoints to the new spout, to avoid the new spout starting from scratch on your partitions. Storm provides a helper tool to do this which can be found <a href="https://github.com/apache/storm/tree/master/external/storm-kafka-migration">here</a>.</p>
+<p>For the most part, the migration to storm-kafka-client is straightforward. The documentation for storm-kafka-client contains a helpful mapping between the old and new spout configurations. If you are using any of the storm-kafka spouts, you will need to migrate offset checkpoints to the new spout, to avoid the new spout starting from scratch on your partitions. Apache Storm provides a helper tool to do this which can be found <a href="https://github.com/apache/storm/tree/master/external/storm-kafka-migration">here</a>.</p>
 
 <p>When performing a migration, you should stop your topology, run the migration tool, then redeploy your topology with the storm-kafka-client spout.</p>
 
 <h3 id="move-to-using-the-kafkaconsumer-assign-api">Move to Using the KafkaConsumer.assign API</h3>
 
-<p>Storm-kafka-client in Storm 1.x allowed you to use Kafka&#39;s own mechanism to manage which spout tasks were responsible for which partitions. This mechanism was a poor fit for Storm, and was deprecated in 1.2.0. It has been <a href="https://issues.apache.org/jira/browse/STORM-2542">removed entirely in 2.0</a>.</p>
+<p>Storm-kafka-client in Apache Storm 1.x allowed you to use Kafka&#39;s own mechanism to manage which spout tasks were responsible for which partitions. This mechanism was a poor fit for Apache Storm, and was deprecated in 1.2.0. It has been <a href="https://issues.apache.org/jira/browse/STORM-2542">removed entirely in 2.0</a>.</p>
 
 <p>The storm-kafka-client Subscription interface has also been removed. It offered too limited control over the subscription behavior. It has been replaced with the TopicFilter and ManualPartitioner interfaces. Unless you were using a custom Subscription implementation, this will likely not
 affect you. If you were using a custom Subscription, <a href="https://github.com/apache/storm/blob/master/docs/storm-kafka-client.md#manual-partition-assigment-advanced">the storm-kafka-client documentation describes how to customize assignment</a>.</p>
@@ -289,17 +289,17 @@
 
 <h2 id="move-to-java-8">Move to Java 8</h2>
 
-<p>Java 7 support has been dropped, and Storm 2.0.0 requires Java 8.</p>
+<p>Java 7 support has been dropped, and Apache Storm 2.0.0 requires Java 8.</p>
 
-<h2 id="reorganization-of-storm-maven-artifacts">Reorganization of Storm Maven artifacts</h2>
+<h2 id="reorganization-of-apache-storm-maven-artifacts">Reorganization of Apache Storm Maven artifacts</h2>
 
-<p>The storm-core artifact has <a href="https://issues.apache.org/jira/browse/STORM-2441">been split</a> into client and server-facing parts. Topology jars should depend on the following artifact as of Storm 2.0.0:</p>
+<p>The storm-core artifact has <a href="https://issues.apache.org/jira/browse/STORM-2441">been split</a> into client and server-facing parts. Topology jars should depend on the following artifact as of Apache Storm 2.0.0:</p>
 <div class="highlight"><pre><code class="language-" data-lang="">&lt;groupId&gt;org.apache.storm&lt;/groupId&gt;
 &lt;artifactId&gt;storm-client&lt;/artifactId&gt;
 &lt;version&gt;2.0.0&lt;/version&gt;
 &lt;scope&gt;provided&lt;/scope&gt;
 </code></pre></div>
-<p>Projects using <code>LocalCluster</code> for testing will additionally need to depend on the Storm server jar:</p>
+<p>Projects using <code>LocalCluster</code> for testing will additionally need to depend on the Apache Storm server jar:</p>
 <div class="highlight"><pre><code class="language-" data-lang="">&lt;groupId&gt;org.apache.storm&lt;/groupId&gt;
 &lt;artifactId&gt;storm-server&lt;/artifactId&gt;
 &lt;version&gt;2.0.0&lt;/version&gt;
@@ -307,7 +307,7 @@
 </code></pre></div>
 <h2 id="stay-tuned">Stay Tuned</h2>
 
-<p>Keep an eye on the Apache Storm blog for additional posts by Storm contributors for more in-depth discussions of new features in Storm 2.0.0 including:</p>
+<p>Keep an eye on the Apache Storm blog for additional posts by Apache Storm contributors for more in-depth discussions of new features in Apache Storm 2.0.0 including:</p>
 
 <ul>
 <li>SQL enhancements</li>
@@ -356,8 +356,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -367,7 +367,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/2019/07/18/storm123-released.html b/content/2019/07/18/storm123-released.html
index 7b2bbda..382b965 100644
--- a/content/2019/07/18/storm123-released.html
+++ b/content/2019/07/18/storm123-released.html
@@ -9,7 +9,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm 1.2.3 Released</title>
+    <title>Apache Storm 1.2.3 Released</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -108,61 +108,61 @@
                     <div class="col-md-3">
                         <ul class="news" id="news-list">
                             
-                      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+                      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
                     		
-                      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+                      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+                      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
                     		
-                      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+                      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
                     		
-                      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+                      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+                      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
                     		
-                      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+                      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
                     		
-                      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+                      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
                     		
-                      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+                      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
                     		
-                      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+                      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
                     		
-                      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+                      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
                     		
-                      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+                      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
                     		
-                      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+                      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
                     		
-                      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+                      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
                     		
-                      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+                      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
                     		
-                      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+                      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
                     		
-                      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+                      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
                     		
-                      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+                      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
                     		
-                      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+                      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+                      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
                     		
-                      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+                      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
                     		
-                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+                      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
                     		
-                      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+                      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
                     		
-                      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+                      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
                     		
-                      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+                      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
                     		
-                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+                      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
                     		
-                      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+                      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
                     		
-                      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+                      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
                     		
                       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
                     		
@@ -190,19 +190,19 @@
                     		
                       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
                     		
-                      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+                      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
                     		
-                      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+                      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
                     		
-                      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+                      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
                     		
-                      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+                      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
                     		
                         </ul>
                     </div>
                     <div class="col-md-9" id="news-content">
                             <h1 class="page-title">
-                               Storm 1.2.3 Released
+                               Apache Storm 1.2.3 Released
                             </h1>
                                 
                             <div class="row" style="margin: -15px;">
@@ -232,7 +232,7 @@
                         <div>
                 	        <p>The Apache Storm community is pleased to announce that version 1.2.3 has been released and is available from <a href="/downloads.html">the downloads page</a>.</p>
 
-<p>This is a maintenance release that includes a number of important bug fixes that improve Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
+<p>This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.</p>
 
 <h2 id="thanks">Thanks</h2>
 
@@ -331,8 +331,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -342,7 +342,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/Powered-By.html b/content/Powered-By.html
index 0f8cc43..b7213c1 100644
--- a/content/Powered-By.html
+++ b/content/Powered-By.html
@@ -1190,8 +1190,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -1201,7 +1201,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/about/deployment.html b/content/about/deployment.html
index 79dcddd..84d18bf 100644
--- a/content/about/deployment.html
+++ b/content/about/deployment.html
@@ -142,9 +142,9 @@
           </ul>
           </div>
           <div class="col-md-9">
-                    <p>Storm clusters are easy to deploy, requiring a minimum of setup and configuration to get up and running. Storm&#39;s out of the box configurations are suitable for production. Read more about how to deploy a Storm cluster <a href="/documentation/Setting-up-a-Storm-cluster.html">here</a>.</p>
+                    <p>Apache Storm clusters are easy to deploy, requiring a minimum of setup and configuration to get up and running. Apache Storm&#39;s out of the box configurations are suitable for production. Read more about how to deploy an Apache Storm cluster <a href="/documentation/Setting-up-a-Storm-cluster.html">here</a>.</p>
 
-<p>Additionally, Storm is easy to operate once deployed. Storm has been designed to be <a href="/about/fault-tolerant.html">extremely robust</a> – the cluster will just keep on running, month after month.</p>
+<p>Additionally, Apache Storm is easy to operate once deployed. Apache Storm has been designed to be <a href="/about/fault-tolerant.html">extremely robust</a> – the cluster will just keep on running, month after month.</p>
 
 
         </div>
@@ -179,8 +179,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -190,7 +190,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/about/fault-tolerant.html b/content/about/fault-tolerant.html
index 35eb506..a2d1477 100644
--- a/content/about/fault-tolerant.html
+++ b/content/about/fault-tolerant.html
@@ -142,11 +142,11 @@
           </ul>
           </div>
           <div class="col-md-9">
-                    <p>Storm is fault-tolerant: when workers die, Storm will automatically restart them. If a node dies, the worker will be restarted on another node.</p>
+                    <p>Apache Storm is fault-tolerant: when workers die, Apache Storm will automatically restart them. If a node dies, the worker will be restarted on another node.</p>
 
-<p>The Storm daemons, Nimbus and the Supervisors, are designed to be stateless and fail-fast. So if they die, they will restart like nothing happened. This means you can <em>kill -9</em> the Storm daemons without affecting the health of the cluster or your topologies.</p>
+<p>The Apache Storm daemons, Nimbus and the Supervisors, are designed to be stateless and fail-fast. So if they die, they will restart like nothing happened. This means you can <em>kill -9</em> the Apache Storm daemons without affecting the health of the cluster or your topologies.</p>
 
-<p>Read more about Storm&#39;s fault-tolerance <a href="/documentation/Fault-tolerance.html">on the manual</a>.</p>
+<p>Read more about Apache Storm&#39;s fault-tolerance <a href="/documentation/Fault-tolerance.html">on the manual</a>.</p>
 
 
         </div>
@@ -181,8 +181,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -192,7 +192,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/about/free-and-open-source.html b/content/about/free-and-open-source.html
index 3c85a51..7486c78 100644
--- a/content/about/free-and-open-source.html
+++ b/content/about/free-and-open-source.html
@@ -144,7 +144,7 @@
           <div class="col-md-9">
                     <p>Apache Storm is a free and open source project licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a></p>
 
-<p>Storm has a large and growing ecosystem of libraries and tools to use in conjunction with Storm including everything from:</p>
+<p>Apache Storm has a large and growing ecosystem of libraries and tools to use in conjunction with Apache Storm including everything from:</p>
 
 <ol>
 <li><em>Spouts</em>: These spouts integrate with queueing systems such as JMS, Kafka, Redis pub/sub, and more.</li>
@@ -153,7 +153,7 @@
 <li>Other miscellaneous utilities</li>
 </ol>
 
-<p>The <a href="/documentation.html">Storm documentation</a> has links to notable Storm-related projects hosted outside of Apache.</p>
+<p>The <a href="/documentation.html">Apache Storm documentation</a> has links to notable Apache Storm related projects hosted outside of Apache.</p>
 
 
         </div>
@@ -188,8 +188,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -199,7 +199,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/about/guarantees-data-processing.html b/content/about/guarantees-data-processing.html
index c590f1f..53ca30d72 100644
--- a/content/about/guarantees-data-processing.html
+++ b/content/about/guarantees-data-processing.html
@@ -142,11 +142,11 @@
           </ul>
           </div>
           <div class="col-md-9">
-                    <p>Storm guarantees every tuple will be fully processed. One of Storm&#39;s core mechanisms is the ability to track the lineage of a tuple as it makes its way through the topology in an extremely efficient way. Read more about how this works <a href="/documentation/Guaranteeing-message-processing.html">here</a>.</p>
+                    <p>Apache Storm guarantees every tuple will be fully processed. One of Apache Storm&#39;s core mechanisms is the ability to track the lineage of a tuple as it makes its way through the topology in an extremely efficient way. Read more about how this works <a href="/documentation/Guaranteeing-message-processing.html">here</a>.</p>
 
-<p>Storm&#39;s basic abstractions provide an at-least-once processing guarantee, the same guarantee you get when using a queueing system. Messages are only replayed when there are failures.</p>
+<p>Apache Storm&#39;s basic abstractions provide an at-least-once processing guarantee, the same guarantee you get when using a queueing system. Messages are only replayed when there are failures.</p>
 
-<p>Using <a href="/documentation/Trident-tutorial.html">Trident</a>, a higher level abstraction over Storm&#39;s basic abstractions, you can achieve exactly-once processing semantics.</p>
+<p>Using <a href="/documentation/Trident-tutorial.html">Trident</a>, a higher level abstraction over Apache Storm&#39;s basic abstractions, you can achieve exactly-once processing semantics.</p>
 
 
         </div>
@@ -181,8 +181,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -192,7 +192,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/about/integrates.html b/content/about/integrates.html
index cad5345..5f82b62 100644
--- a/content/about/integrates.html
+++ b/content/about/integrates.html
@@ -142,7 +142,7 @@
           </ul>
           </div>
           <div class="col-md-9">
-                    <p>Storm integrates with any queueing system and any database system. Storm&#39;s <a href="/apidocs/backtype/storm/spout/ISpout.html">spout</a> abstraction makes it easy to integrate a new queuing system. Example queue integrations include:</p>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm&#39;s <a href="/apidocs/backtype/storm/spout/ISpout.html">spout</a> abstraction makes it easy to integrate a new queuing system. Example queue integrations include:</p>
 
 <ol>
 <li><a href="https://github.com/nathanmarz/storm-kestrel">Kestrel</a></li>
@@ -152,7 +152,7 @@
 <li><a href="https://github.com/awslabs/kinesis-storm-spout">Amazon Kinesis</a></li>
 </ol>
 
-<p>Likewise, integrating Storm with database systems is easy. Simply open a connection to your database and read/write like you normally would. Storm will handle the parallelization, partitioning, and retrying on failures when necessary.</p>
+<p>Likewise, integrating Apache Storm with database systems is easy. Simply open a connection to your database and read/write like you normally would. Apache Storm will handle the parallelization, partitioning, and retrying on failures when necessary.</p>
 
 
         </div>
@@ -187,8 +187,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -198,7 +198,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/about/multi-language.html b/content/about/multi-language.html
index 56abf3b..877ffe2 100644
--- a/content/about/multi-language.html
+++ b/content/about/multi-language.html
@@ -142,9 +142,9 @@
           </ul>
           </div>
           <div class="col-md-9">
-                    <p>Storm was designed from the ground up to be usable with any programming language. At the core of Storm is a <a href="http://thrift.apache.org/">Thrift</a> <a href="https://github.com/apache/storm/blob/master/storm-core/src/storm.thrift">definition</a> for defining and submitting topologies. Since Thrift can be used in any language, topologies can be defined and submitted from any language.</p>
+                    <p>Apache Storm was designed from the ground up to be usable with any programming language. At the core of Apache Storm is a <a href="http://thrift.apache.org/">Thrift</a> <a href="https://github.com/apache/storm/blob/master/storm-core/src/storm.thrift">definition</a> for defining and submitting topologies. Since Thrift can be used in any language, topologies can be defined and submitted from any language.</p>
 
-<p>Similarly, spouts and bolts can be defined in any language. Non-JVM spouts and bolts communicate to Storm over a <a href="/documentation/Multilang-protocol.html">JSON-based protocol</a> over stdin/stdout. Adapters that implement this protocol exist for <a href="https://github.com/apache/storm/blob/master/storm-multilang/ruby/src/main/resources/resources/storm.rb">Ruby</a>, <a href="https://github.com/apache/storm/blob/master/storm-multilang/python/src/main/resources/resources/storm.py">Python</a>, <a href="https://github.com/apache/storm/blob/master/storm-multilang/javascript/src/main/resources/resources/storm.js">Javascript</a>, <a href="https://github.com/dan-blanchard/io-storm">Perl</a>.</p>
+<p>Similarly, spouts and bolts can be defined in any language. Non-JVM spouts and bolts communicate to Apache Storm over a <a href="/documentation/Multilang-protocol.html">JSON-based protocol</a> over stdin/stdout. Adapters that implement this protocol exist for <a href="https://github.com/apache/storm/blob/master/storm-multilang/ruby/src/main/resources/resources/storm.rb">Ruby</a>, <a href="https://github.com/apache/storm/blob/master/storm-multilang/python/src/main/resources/resources/storm.py">Python</a>, <a href="https://github.com/apache/storm/blob/master/storm-multilang/javascript/src/main/resources/resources/storm.js">Javascript</a>, <a href="https://github.com/dan-blanchard/io-storm">Perl</a>.</p>
 
 <p><em>storm-starter</em> has an <a href="https://github.com/apache/storm/blob/master/examples/storm-starter/src/jvm/storm/starter/WordCountTopology.java">example topology</a> that implements one of the bolts in Python.</p>
 
@@ -181,8 +181,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -192,7 +192,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/about/scalable.html b/content/about/scalable.html
index 2b5f07e..08d0b4d 100644
--- a/content/about/scalable.html
+++ b/content/about/scalable.html
@@ -142,9 +142,9 @@
           </ul>
           </div>
           <div class="col-md-9">
-                    <p>Storm topologies are inherently parallel and run across a cluster of machines. Different parts of the topology can be scaled individually by tweaking their parallelism. The &quot;rebalance&quot; command of the &quot;storm&quot; command line client can adjust the parallelism of running topologies on the fly. </p>
+                    <p>Apache Storm topologies are inherently parallel and run across a cluster of machines. Different parts of the topology can be scaled individually by tweaking their parallelism. The &quot;rebalance&quot; command of the &quot;storm&quot; command line client can adjust the parallelism of running topologies on the fly. </p>
 
-<p>Storm&#39;s inherent parallelism means it can process very high throughputs of messages with very low latency. Storm was benchmarked at processing <strong>one million 100 byte messages per second per node</strong> on hardware with the following specs:</p>
+<p>Apache Storm&#39;s inherent parallelism means it can process very high throughputs of messages with very low latency. Apache Storm was benchmarked at processing <strong>one million 100 byte messages per second per node</strong> on hardware with the following specs:</p>
 
 <ul>
 <li><strong>Processor:</strong> 2x Intel <a href="mailto:E5645@2.4Ghz">E5645@2.4Ghz</a> </li>
@@ -184,8 +184,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -195,7 +195,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/about/simple-api.html b/content/about/simple-api.html
index 4f090a7..08a7e2f 100644
--- a/content/about/simple-api.html
+++ b/content/about/simple-api.html
@@ -142,17 +142,17 @@
           </ul>
           </div>
           <div class="col-md-9">
-                    <p>Storm has a simple and easy to use API. When programming on Storm, you manipulate and transform streams of tuples, and a tuple is a named list of values. Tuples can contain objects of any type; if you want to use a type Storm doesn&#39;t know about it&#39;s <a href="/releases/current/Serialization.html">very easy</a> to register a serializer for that type.</p>
+                    <p>Apache Storm has a simple and easy to use API. When programming on Apache Storm, you manipulate and transform streams of tuples, and a tuple is a named list of values. Tuples can contain objects of any type; if you want to use a type Apache Storm doesn&#39;t know about it&#39;s <a href="/releases/current/Serialization.html">very easy</a> to register a serializer for that type.</p>
 
-<p>There are just three abstractions in Storm: spouts, bolts, and topologies. A <strong>spout</strong> is a source of streams in a computation. Typically a spout reads from a queueing broker such as Kestrel, RabbitMQ, or Kafka, but a spout can also generate its own stream or read from somewhere like the Twitter streaming API. Spout implementations already exist for most queueing systems.</p>
+<p>There are just three abstractions in Apache Storm: spouts, bolts, and topologies. A <strong>spout</strong> is a source of streams in a computation. Typically a spout reads from a queueing broker such as Kestrel, RabbitMQ, or Kafka, but a spout can also generate its own stream or read from somewhere like the Twitter streaming API. Spout implementations already exist for most queueing systems.</p>
 
 <p>A <strong>bolt</strong> processes any number of input streams and produces any number of new output streams. Most of the logic of a computation goes into bolts, such as functions, filters, streaming joins, streaming aggregations, talking to databases, and so on.</p>
 
 <p>A <strong>topology</strong> is a network of spouts and bolts, with each edge in the network representing a bolt subscribing to the output stream of some other spout or bolt. A topology is an arbitrarily complex multi-stage stream computation. Topologies run indefinitely when deployed.</p>
 
-<p>Storm has a &quot;local mode&quot; where a Storm cluster is simulated in-process. This is useful for development and testing. The &quot;storm&quot; command line client is used when ready to submit a topology for execution on an actual cluster.</p>
+<p>Apache Storm has a &quot;local mode&quot; where a Apache Storm cluster is simulated in-process. This is useful for development and testing. The &quot;storm&quot; command line client is used when ready to submit a topology for execution on an actual cluster.</p>
 
-<p>The <a href="https://github.com/apache/storm/tree/master/examples/storm-starter">storm-starter</a> project contains example topologies for learning the basics of Storm. Learn more about how to use Storm by reading the <a href="/releases/current/Tutorial.html">tutorial</a> and the <a href="/releases/current/index.html">documentation</a>.</p>
+<p>The <a href="https://github.com/apache/storm/tree/master/examples/storm-starter">storm-starter</a> project contains example topologies for learning the basics of Apache Storm. Learn more about how to use Apache Storm by reading the <a href="/releases/current/Tutorial.html">tutorial</a> and the <a href="/releases/current/index.html">documentation</a>.</p>
 
 
         </div>
@@ -187,8 +187,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -198,7 +198,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/contribute/BYLAWS.html b/content/contribute/BYLAWS.html
index 0244799..f38b879 100644
--- a/content/contribute/BYLAWS.html
+++ b/content/contribute/BYLAWS.html
@@ -352,8 +352,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -363,7 +363,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/contribute/Contributing-to-Storm.html b/content/contribute/Contributing-to-Storm.html
index 9864de8..f417caf 100644
--- a/content/contribute/Contributing-to-Storm.html
+++ b/content/contribute/Contributing-to-Storm.html
@@ -163,8 +163,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -174,7 +174,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/contribute/People.html b/content/contribute/People.html
index f6b895c..aa9af85 100644
--- a/content/contribute/People.html
+++ b/content/contribute/People.html
@@ -454,8 +454,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -465,7 +465,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/downloads.html b/content/downloads.html
index 549a457..036d38a 100644
--- a/content/downloads.html
+++ b/content/downloads.html
@@ -8,7 +8,7 @@
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
     <link rel="icon" href="/favicon.ico" type="image/x-icon">
 
-    <title>Storm downloads</title>
+    <title>Apache Storm downloads</title>
 
     <!-- Bootstrap core CSS -->
     <link href="/assets/css/bootstrap.min.css" rel="stylesheet">
@@ -99,7 +99,7 @@
 
 
     <div class="container-fluid">
-    <h1 class="page-title">Storm downloads</h1>
+    <h1 class="page-title">Apache Storm downloads</h1>
           <div class="row">
            	<div class="col-md-12">
 	             <div class="content">
@@ -107,7 +107,7 @@
     	<div class="row">
         	<div class="col-md-12">
 				  <p>
-				  Downloads for Apache Storm are below. Instructions for how to set up a Storm cluster can be found <a href="/documentation/Setting-up-a-Storm-cluster.html">here</a>.
+				  Downloads for Apache Storm are below. Instructions for how to set up an Apache Storm cluster can be found <a href="/documentation/Setting-up-a-Storm-cluster.html">here</a>.
 				  </p>
               
 				  <h3>Current 2.0.x Release</h3>
@@ -136,7 +136,7 @@
 					     [<a href="https://www.apache.org/dist/storm/apache-storm-2.0.0/apache-storm-2.0.0-src.zip.sha512">SHA512</a>] 
 					  </li>
 				  </ul>
-				  Storm artifacts are hosted in <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">Maven Central</a>. You can add Storm as a dependency with the following coordinates:
+				  Apache Storm artifacts are hosted in <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">Maven Central</a>. You can add Apache Storm as a dependency with the following coordinates:
 
 				  <pre>
 groupId: <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">org.apache.storm</a>
@@ -169,7 +169,7 @@
 					     [<a href="https://www.apache.org/dist/storm/apache-storm-1.2.3/apache-storm-1.2.3-src.zip.sha">SHA512</a>] 
 					  </li>
 				  </ul>
-				  Storm artifacts are hosted in <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">Maven Central</a>. You can add Storm as a dependency with the following coordinates:
+				  Apache Storm artifacts are hosted in <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">Maven Central</a>. You can add Apache Storm as a dependency with the following coordinates:
 
 				  <pre>
 groupId: <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">org.apache.storm</a>
@@ -212,8 +212,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -223,7 +223,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/feed.xml b/content/feed.xml
index 9e2ea3e..e131ca4 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -5,15 +5,15 @@
     <description></description>
     <link>http://storm.apache.org/</link>
     <atom:link href="http://storm.apache.org/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Fri, 19 Jul 2019 19:07:38 +0200</pubDate>
-    <lastBuildDate>Fri, 19 Jul 2019 19:07:38 +0200</lastBuildDate>
+    <pubDate>Tue, 13 Aug 2019 22:42:04 -0500</pubDate>
+    <lastBuildDate>Tue, 13 Aug 2019 22:42:04 -0500</lastBuildDate>
     <generator>Jekyll v3.6.2</generator>
     
       <item>
-        <title>Storm 1.2.3 Released</title>
+        <title>Apache Storm 1.2.3 Released</title>
         <description>&lt;p&gt;The Apache Storm community is pleased to announce that version 1.2.3 has been released and is available from &lt;a href=&quot;/downloads.html&quot;&gt;the downloads page&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
+&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
 
 &lt;h2 id=&quot;thanks&quot;&gt;Thanks&lt;/h2&gt;
 
@@ -80,7 +80,7 @@
 &lt;li&gt;[&lt;a href=&quot;https://issues.apache.org/jira/browse/STORM-3330&quot;&gt;STORM-3330&lt;/a&gt;] - Migrate parts of storm-webapp, and reduce use of mocks for files&lt;/li&gt;
 &lt;/ul&gt;
 </description>
-        <pubDate>Thu, 18 Jul 2019 00:00:00 +0200</pubDate>
+        <pubDate>Thu, 18 Jul 2019 00:00:00 -0500</pubDate>
         <link>http://storm.apache.org/2019/07/18/storm123-released.html</link>
         <guid isPermaLink="true">http://storm.apache.org/2019/07/18/storm123-released.html</guid>
         
@@ -88,7 +88,7 @@
       </item>
     
       <item>
-        <title>Storm 2.0.0 Released</title>
+        <title>Apache Storm 2.0.0 Released</title>
         <description>&lt;p&gt;The Apache Storm community is pleased to announce that version 2.0.0 has been released and is available from &lt;a href=&quot;/downloads.html&quot;&gt;the downloads page&lt;/a&gt;. This release represents a major milestone and accomplishment by the Apache Storm community.&lt;/p&gt;
 
 &lt;p&gt;Apache Storm 2.0.0 includes significant improvements in terms of performance, new features, and integration with external systems. In the coming weeks members will post a series of deep dive articles covering new features improvements. In this post we&amp;#39;ll highlight some of the key features and changes in this release.&lt;/p&gt;
@@ -97,21 +97,21 @@
 
 &lt;h2 id=&quot;new-architecture-implemented-in-java&quot;&gt;New Architecture Implemented in Java&lt;/h2&gt;
 
-&lt;p&gt;In previous releases a large part of Storm&amp;#39;s core functionality was implemented in Clojure. Storm 2.0.0 has been rearchitected with it&amp;#39;s core functionality implemented in pure Java. The new Java-based implementation has improved performance significantly, and made Storm&amp;#39;s internal APIs more maintainable and extensible. While Storm&amp;#39;s Clojure implementation served it well for many years, it was often cited as a barrier for entry to new contributors. Storm&amp;#39;s codebase is now more accessible to developers who don&amp;#39;t want to learn Clojure in order to contribute.&lt;/p&gt;
+&lt;p&gt;In previous releases a large part of Apache Storm&amp;#39;s core functionality was implemented in Clojure. Apache Storm 2.0.0 has been rearchitected with it&amp;#39;s core functionality implemented in pure Java. The new Java-based implementation has improved performance significantly, and made Apache Storm&amp;#39;s internal APIs more maintainable and extensible. While Apache Storm&amp;#39;s Clojure implementation served it well for many years, it was often cited as a barrier for entry to new contributors. Apache Storm&amp;#39;s codebase is now more accessible to developers who don&amp;#39;t want to learn Clojure in order to contribute.&lt;/p&gt;
 
 &lt;h2 id=&quot;new-high-performance-core&quot;&gt;New High Performance Core:&lt;/h2&gt;
 
-&lt;p&gt;Storm 2.0.0 introduces a new core featuring a leaner threading model, a blazing fast messaging subsystem and a lightweight back pressure model. It is designed to push boundaries on throughput, latency and energy consumption while maintaining backward compatibility. The design was motivated by the observation that existing hardware remains capable of much more than what the best streaming engines can deliver. Storm 2.0 is the first streaming engine to break the 1 microsecond latency barrier.&lt;/p&gt;
+&lt;p&gt;Apache Storm 2.0.0 introduces a new core featuring a leaner threading model, a blazing fast messaging subsystem and a lightweight back pressure model. It is designed to push boundaries on throughput, latency and energy consumption while maintaining backward compatibility. The design was motivated by the observation that existing hardware remains capable of much more than what the best streaming engines can deliver. Apache Storm 2.0 is the first streaming engine to break the 1 microsecond latency barrier.&lt;/p&gt;
 
 &lt;h2 id=&quot;new-streams-api&quot;&gt;New Streams API&lt;/h2&gt;
 
-&lt;p&gt;Storm 2.0.0 introduces a new typed API for expressing streaming computations more easily using functional style operations. It builds on top of the Storm&amp;#39;s core spouts and bolt APIs and automatically fuses multiple operations together to optimize the pipeline.&lt;/p&gt;
+&lt;p&gt;Apache Storm 2.0.0 introduces a new typed API for expressing streaming computations more easily using functional style operations. It builds on top of the Apache Storm&amp;#39;s core spouts and bolt APIs and automatically fuses multiple operations together to optimize the pipeline.&lt;/p&gt;
 
 &lt;p&gt;For more details and examples see the &lt;a href=&quot;https://github.com/apache/storm/blob/master/docs/Stream-API.md&quot;&gt;Stream API documentation&lt;/a&gt;.&lt;/p&gt;
 
 &lt;h2 id=&quot;windowing-enhancements&quot;&gt;Windowing Enhancements&lt;/h2&gt;
 
-&lt;p&gt;Storm 2.0.0&amp;#39;s Windowing API can save/restore the window state to the configured state backend so that larger continuous windows can be supported. The window boundaries can now be accessed via the APIs.&lt;/p&gt;
+&lt;p&gt;Apache Storm 2.0.0&amp;#39;s Windowing API can save/restore the window state to the configured state backend so that larger continuous windows can be supported. The window boundaries can now be accessed via the APIs.&lt;/p&gt;
 
 &lt;p&gt;For more details see &lt;a href=&quot;https://github.com/apache/storm/blob/master/docs/Windowing.md#stateful-windowing&quot;&gt;stateful windowing documentation&lt;/a&gt;.&lt;/p&gt;
 
@@ -119,15 +119,15 @@
 
 &lt;h3 id=&quot;removal-of-storm-kafka&quot;&gt;Removal of Storm-Kafka&lt;/h3&gt;
 
-&lt;p&gt;The most significant change to Storm&amp;#39;s Kafka integration since 1.x, is that storm-kafka has been removed. The module was deprecated a while back, due to Kafka&amp;#39;s deprecation of the underlying client library. Users will have to move to the storm-kafka-client module, which uses Kafka&amp;#39;s ´kafka-clients´ library for integration.&lt;/p&gt;
+&lt;p&gt;The most significant change to Apache Storm&amp;#39;s Kafka integration since 1.x, is that storm-kafka has been removed. The module was deprecated a while back, due to Kafka&amp;#39;s deprecation of the underlying client library. Users will have to move to the storm-kafka-client module, which uses Kafka&amp;#39;s ´kafka-clients´ library for integration.&lt;/p&gt;
 
-&lt;p&gt;For the most part, the migration to storm-kafka-client is straightforward. The documentation for storm-kafka-client contains a helpful mapping between the old and new spout configurations. If you are using any of the storm-kafka spouts, you will need to migrate offset checkpoints to the new spout, to avoid the new spout starting from scratch on your partitions. Storm provides a helper tool to do this which can be found &lt;a href=&quot;https://github.com/apache/storm/tree/master/external/storm-kafka-migration&quot;&gt;here&lt;/a&gt;.&lt;/p&gt;
+&lt;p&gt;For the most part, the migration to storm-kafka-client is straightforward. The documentation for storm-kafka-client contains a helpful mapping between the old and new spout configurations. If you are using any of the storm-kafka spouts, you will need to migrate offset checkpoints to the new spout, to avoid the new spout starting from scratch on your partitions. Apache Storm provides a helper tool to do this which can be found &lt;a href=&quot;https://github.com/apache/storm/tree/master/external/storm-kafka-migration&quot;&gt;here&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;When performing a migration, you should stop your topology, run the migration tool, then redeploy your topology with the storm-kafka-client spout.&lt;/p&gt;
 
 &lt;h3 id=&quot;move-to-using-the-kafkaconsumer-assign-api&quot;&gt;Move to Using the KafkaConsumer.assign API&lt;/h3&gt;
 
-&lt;p&gt;Storm-kafka-client in Storm 1.x allowed you to use Kafka&amp;#39;s own mechanism to manage which spout tasks were responsible for which partitions. This mechanism was a poor fit for Storm, and was deprecated in 1.2.0. It has been &lt;a href=&quot;https://issues.apache.org/jira/browse/STORM-2542&quot;&gt;removed entirely in 2.0&lt;/a&gt;.&lt;/p&gt;
+&lt;p&gt;Storm-kafka-client in Apache Storm 1.x allowed you to use Kafka&amp;#39;s own mechanism to manage which spout tasks were responsible for which partitions. This mechanism was a poor fit for Apache Storm, and was deprecated in 1.2.0. It has been &lt;a href=&quot;https://issues.apache.org/jira/browse/STORM-2542&quot;&gt;removed entirely in 2.0&lt;/a&gt;.&lt;/p&gt;
 
 &lt;p&gt;The storm-kafka-client Subscription interface has also been removed. It offered too limited control over the subscription behavior. It has been replaced with the TopicFilter and ManualPartitioner interfaces. Unless you were using a custom Subscription implementation, this will likely not
 affect you. If you were using a custom Subscription, &lt;a href=&quot;https://github.com/apache/storm/blob/master/docs/storm-kafka-client.md#manual-partition-assigment-advanced&quot;&gt;the storm-kafka-client documentation describes how to customize assignment&lt;/a&gt;.&lt;/p&gt;
@@ -148,17 +148,17 @@
 
 &lt;h2 id=&quot;move-to-java-8&quot;&gt;Move to Java 8&lt;/h2&gt;
 
-&lt;p&gt;Java 7 support has been dropped, and Storm 2.0.0 requires Java 8.&lt;/p&gt;
+&lt;p&gt;Java 7 support has been dropped, and Apache Storm 2.0.0 requires Java 8.&lt;/p&gt;
 
-&lt;h2 id=&quot;reorganization-of-storm-maven-artifacts&quot;&gt;Reorganization of Storm Maven artifacts&lt;/h2&gt;
+&lt;h2 id=&quot;reorganization-of-apache-storm-maven-artifacts&quot;&gt;Reorganization of Apache Storm Maven artifacts&lt;/h2&gt;
 
-&lt;p&gt;The storm-core artifact has &lt;a href=&quot;https://issues.apache.org/jira/browse/STORM-2441&quot;&gt;been split&lt;/a&gt; into client and server-facing parts. Topology jars should depend on the following artifact as of Storm 2.0.0:&lt;/p&gt;
+&lt;p&gt;The storm-core artifact has &lt;a href=&quot;https://issues.apache.org/jira/browse/STORM-2441&quot;&gt;been split&lt;/a&gt; into client and server-facing parts. Topology jars should depend on the following artifact as of Apache Storm 2.0.0:&lt;/p&gt;
 &lt;div class=&quot;highlight&quot;&gt;&lt;pre&gt;&lt;code class=&quot;language-&quot; data-lang=&quot;&quot;&gt;&amp;lt;groupId&amp;gt;org.apache.storm&amp;lt;/groupId&amp;gt;
 &amp;lt;artifactId&amp;gt;storm-client&amp;lt;/artifactId&amp;gt;
 &amp;lt;version&amp;gt;2.0.0&amp;lt;/version&amp;gt;
 &amp;lt;scope&amp;gt;provided&amp;lt;/scope&amp;gt;
 &lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;
-&lt;p&gt;Projects using &lt;code&gt;LocalCluster&lt;/code&gt; for testing will additionally need to depend on the Storm server jar:&lt;/p&gt;
+&lt;p&gt;Projects using &lt;code&gt;LocalCluster&lt;/code&gt; for testing will additionally need to depend on the Apache Storm server jar:&lt;/p&gt;
 &lt;div class=&quot;highlight&quot;&gt;&lt;pre&gt;&lt;code class=&quot;language-&quot; data-lang=&quot;&quot;&gt;&amp;lt;groupId&amp;gt;org.apache.storm&amp;lt;/groupId&amp;gt;
 &amp;lt;artifactId&amp;gt;storm-server&amp;lt;/artifactId&amp;gt;
 &amp;lt;version&amp;gt;2.0.0&amp;lt;/version&amp;gt;
@@ -166,7 +166,7 @@
 &lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;
 &lt;h2 id=&quot;stay-tuned&quot;&gt;Stay Tuned&lt;/h2&gt;
 
-&lt;p&gt;Keep an eye on the Apache Storm blog for additional posts by Storm contributors for more in-depth discussions of new features in Storm 2.0.0 including:&lt;/p&gt;
+&lt;p&gt;Keep an eye on the Apache Storm blog for additional posts by Apache Storm contributors for more in-depth discussions of new features in Apache Storm 2.0.0 including:&lt;/p&gt;
 
 &lt;ul&gt;
 &lt;li&gt;SQL enhancements&lt;/li&gt;
@@ -183,7 +183,7 @@
 
 &lt;p&gt;Special thanks are due to all those who have contributed to Apache Storm -- whether through direct code contributions, documentation, bug reports, or helping other users on the mailing lists. Your efforts are much appreciated.&lt;/p&gt;
 </description>
-        <pubDate>Thu, 30 May 2019 00:00:00 +0200</pubDate>
+        <pubDate>Thu, 30 May 2019 00:00:00 -0500</pubDate>
         <link>http://storm.apache.org/2019/05/30/storm200-released.html</link>
         <guid isPermaLink="true">http://storm.apache.org/2019/05/30/storm200-released.html</guid>
         
@@ -191,10 +191,10 @@
       </item>
     
       <item>
-        <title>Storm 1.2.2 Released</title>
+        <title>Apache Storm 1.2.2 Released</title>
         <description>&lt;p&gt;The Apache Storm community is pleased to announce that version 1.2.2 has been released and is available from &lt;a href=&quot;/downloads.html&quot;&gt;the downloads page&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
+&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
 
 &lt;h2 id=&quot;thanks&quot;&gt;Thanks&lt;/h2&gt;
 
@@ -254,7 +254,7 @@
 &lt;li&gt;[&lt;a href=&quot;https://issues.apache.org/jira/browse/STORM-3005&quot;&gt;STORM-3005&lt;/a&gt;] - [DRPC] LinearDRPCTopologyBuilder shouldn't be deprecated &lt;/li&gt;
 &lt;/ul&gt;
 </description>
-        <pubDate>Mon, 04 Jun 2018 00:00:00 +0200</pubDate>
+        <pubDate>Mon, 04 Jun 2018 00:00:00 -0500</pubDate>
         <link>http://storm.apache.org/2018/06/04/storm122-released.html</link>
         <guid isPermaLink="true">http://storm.apache.org/2018/06/04/storm122-released.html</guid>
         
@@ -262,10 +262,10 @@
       </item>
     
       <item>
-        <title>Storm 1.1.3 Released</title>
+        <title>Apache Storm 1.1.3 Released</title>
         <description>&lt;p&gt;The Apache Storm community is pleased to announce that version 1.1.3 has been released and is available from &lt;a href=&quot;/downloads.html&quot;&gt;the downloads page&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
+&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
 
 &lt;h2 id=&quot;thanks&quot;&gt;Thanks&lt;/h2&gt;
 
@@ -325,7 +325,7 @@
 &lt;p&gt;&lt;/body&gt;
 &lt;/html&gt;&lt;/p&gt;
 </description>
-        <pubDate>Mon, 04 Jun 2018 00:00:00 +0200</pubDate>
+        <pubDate>Mon, 04 Jun 2018 00:00:00 -0500</pubDate>
         <link>http://storm.apache.org/2018/06/04/storm113-released.html</link>
         <guid isPermaLink="true">http://storm.apache.org/2018/06/04/storm113-released.html</guid>
         
@@ -333,14 +333,14 @@
       </item>
     
       <item>
-        <title>Storm 1.2.1 Released</title>
+        <title>Apache Storm 1.2.1 Released</title>
         <description>&lt;p&gt;The Apache Storm community is pleased to announce that version 1.2.1 has been released and is available from &lt;a href=&quot;/downloads.html&quot;&gt;the downloads page&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
+&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
 
 &lt;p&gt;In the 1.2.0 release, an LGPL-licensed binary dependency was inadvertently included. The 1.2.0 has since been removed from distribution.&lt;/p&gt;
 
-&lt;p&gt;The dependency in question (Remote Tea Runtime) is required when using the Ganglia reporter for the new metrics system. To enable the Ganglia reporter you will need to download the following &lt;a href=&quot;http://central.maven.org/maven2/org/acplt/oncrpc/1.0.7/oncrpc-1.0.7.jar&quot;&gt;jar&lt;/a&gt; and place it in the &lt;code&gt;lib&lt;/code&gt; directory of the Storm installation.&lt;/p&gt;
+&lt;p&gt;The dependency in question (Remote Tea Runtime) is required when using the Ganglia reporter for the new metrics system. To enable the Ganglia reporter you will need to download the following &lt;a href=&quot;http://central.maven.org/maven2/org/acplt/oncrpc/1.0.7/oncrpc-1.0.7.jar&quot;&gt;jar&lt;/a&gt; and place it in the &lt;code&gt;lib&lt;/code&gt; directory of the Apache Storm installation.&lt;/p&gt;
 
 &lt;h2 id=&quot;thanks&quot;&gt;Thanks&lt;/h2&gt;
 
@@ -360,7 +360,7 @@
 &lt;li&gt;[&lt;a href=&quot;https://issues.apache.org/jira/browse/STORM-2841&quot;&gt;STORM-2841&lt;/a&gt;] - testNoAcksIfFlushFails UT fails with NullPointerException&lt;/li&gt;
 &lt;/ul&gt;
 </description>
-        <pubDate>Mon, 19 Feb 2018 00:00:00 +0100</pubDate>
+        <pubDate>Mon, 19 Feb 2018 00:00:00 -0600</pubDate>
         <link>http://storm.apache.org/2018/02/19/storm121-released.html</link>
         <guid isPermaLink="true">http://storm.apache.org/2018/02/19/storm121-released.html</guid>
         
@@ -368,17 +368,17 @@
       </item>
     
       <item>
-        <title>Storm 1.2.0 Released</title>
+        <title>Apache Storm 1.2.0 Released</title>
         <description>&lt;p&gt;The Apache Storm community is pleased to announce that version 1.2.0 has been released and is available from &lt;a href=&quot;/downloads.html&quot;&gt;the downloads page&lt;/a&gt;.&lt;/p&gt;
 
 &lt;h2 id=&quot;apache-kafka-integration-improvements&quot;&gt;Apache Kafka Integration Improvements&lt;/h2&gt;
 
-&lt;p&gt;This release includes many improvements to Storm&amp;#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
+&lt;p&gt;This release includes many improvements to Apache Storm&amp;#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
 &lt;a href=&quot;/releases/1.2.0/storm-kafka-client.html&quot;&gt;Kafka client documentation&lt;/a&gt;&lt;/p&gt;
 
 &lt;h2 id=&quot;new-metrics-reporting-api&quot;&gt;New Metrics Reporting API&lt;/h2&gt;
 
-&lt;p&gt;This release introduces a new metrics system for reporting internal statistics (e.g. acked, failed, emitted, transferred, disruptor queue metrics, etc.) as well as a new API for user defined metrics based on the popular &lt;a href=&quot;&quot;&gt;Dropwizard Metrics library&lt;/a&gt;. Storm includes reporters for gathering metrics data with Ganglia, Graphite, JMX, CSV and the console. Additional metrics systems can be integrated by extending the &lt;code&gt;org.apache.storm.metrics2.reporters.ScheduledStormReporter&lt;/code&gt; class. Additional details can be found in the &lt;a href=&quot;/releases/1.2.0/metrics_v2.html&quot;&gt;metrics documentation&lt;/a&gt;.&lt;/p&gt;
+&lt;p&gt;This release introduces a new metrics system for reporting internal statistics (e.g. acked, failed, emitted, transferred, disruptor queue metrics, etc.) as well as a new API for user defined metrics based on the popular &lt;a href=&quot;&quot;&gt;Dropwizard Metrics library&lt;/a&gt;. Apache Storm includes reporters for gathering metrics data with Ganglia, Graphite, JMX, CSV and the console. Additional metrics systems can be integrated by extending the &lt;code&gt;org.apache.storm.metrics2.reporters.ScheduledStormReporter&lt;/code&gt; class. Additional details can be found in the &lt;a href=&quot;/releases/1.2.0/metrics_v2.html&quot;&gt;metrics documentation&lt;/a&gt;.&lt;/p&gt;
 
 &lt;h2 id=&quot;thanks&quot;&gt;Thanks&lt;/h2&gt;
 
@@ -585,7 +585,7 @@
 &lt;p&gt;&lt;/body&gt;
 &lt;/html&gt;&lt;/p&gt;
 </description>
-        <pubDate>Thu, 15 Feb 2018 00:00:00 +0100</pubDate>
+        <pubDate>Thu, 15 Feb 2018 00:00:00 -0600</pubDate>
         <link>http://storm.apache.org/2018/02/15/storm120-released.html</link>
         <guid isPermaLink="true">http://storm.apache.org/2018/02/15/storm120-released.html</guid>
         
@@ -593,14 +593,14 @@
       </item>
     
       <item>
-        <title>Storm 1.1.2 Released</title>
+        <title>Apache Storm 1.1.2 Released</title>
         <description>&lt;p&gt;The Apache Storm community is pleased to announce that version 1.1.2 has been released and is available from &lt;a href=&quot;/downloads.html&quot;&gt;the downloads page&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
+&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
 
 &lt;h2 id=&quot;apache-kafka-integration-improvements&quot;&gt;Apache Kafka Integration Improvements&lt;/h2&gt;
 
-&lt;p&gt;This release includes many improvements to Storm&amp;#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
+&lt;p&gt;This release includes many improvements to Apache Storm&amp;#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
 &lt;a href=&quot;/releases/1.1.2/storm-kafka-client.html&quot;&gt;Kafka client documentation&lt;/a&gt;&lt;/p&gt;
 
 &lt;h2 id=&quot;thanks&quot;&gt;Thanks&lt;/h2&gt;
@@ -687,7 +687,7 @@
 &lt;p&gt;&lt;/body&gt;
 &lt;/html&gt;&lt;/p&gt;
 </description>
-        <pubDate>Thu, 15 Feb 2018 00:00:00 +0100</pubDate>
+        <pubDate>Thu, 15 Feb 2018 00:00:00 -0600</pubDate>
         <link>http://storm.apache.org/2018/02/15/storm112-released.html</link>
         <guid isPermaLink="true">http://storm.apache.org/2018/02/15/storm112-released.html</guid>
         
@@ -695,14 +695,14 @@
       </item>
     
       <item>
-        <title>Storm 1.0.6 Released</title>
+        <title>Apache Storm 1.0.6 Released</title>
         <description>&lt;p&gt;The Apache Storm community is pleased to announce that version 1.0.5 has been released and is available from &lt;a href=&quot;/downloads.html&quot;&gt;the downloads page&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
+&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
 
 &lt;h2 id=&quot;apache-kafka-integration-improvements&quot;&gt;Apache Kafka Integration Improvements&lt;/h2&gt;
 
-&lt;p&gt;This release includes many improvements to Storm&amp;#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
+&lt;p&gt;This release includes many improvements to Apache Storm&amp;#39;s Kafka integration that improve stability, ease configuration, and expose new features. More details can be found in the
 &lt;a href=&quot;/releases/1.0.6/storm-kafka-client.html&quot;&gt;Kafka client documentation&lt;/a&gt;&lt;/p&gt;
 
 &lt;h2 id=&quot;thanks&quot;&gt;Thanks&lt;/h2&gt;
@@ -753,7 +753,7 @@
 &lt;p&gt;&lt;/body&gt;
 &lt;/html&gt;&lt;/p&gt;
 </description>
-        <pubDate>Wed, 14 Feb 2018 00:00:00 +0100</pubDate>
+        <pubDate>Wed, 14 Feb 2018 00:00:00 -0600</pubDate>
         <link>http://storm.apache.org/2018/02/14/storm106-released.html</link>
         <guid isPermaLink="true">http://storm.apache.org/2018/02/14/storm106-released.html</guid>
         
@@ -761,10 +761,10 @@
       </item>
     
       <item>
-        <title>Storm 1.0.5 Released</title>
+        <title>Apache Storm 1.0.5 Released</title>
         <description>&lt;p&gt;The Apache Storm community is pleased to announce that version 1.0.5 has been released and is available from &lt;a href=&quot;/downloads.html&quot;&gt;the downloads page&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
+&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
 
 &lt;h2 id=&quot;thanks&quot;&gt;Thanks&lt;/h2&gt;
 
@@ -790,7 +790,7 @@
 &lt;li&gt;[&lt;a href=&quot;https://issues.apache.org/jira/browse/STORM-2705&quot;&gt;STORM-2705&lt;/a&gt;] - DRPCSpout sleeps twice when idle&lt;/li&gt;
 &lt;/ul&gt;
 </description>
-        <pubDate>Fri, 15 Sep 2017 00:00:00 +0200</pubDate>
+        <pubDate>Fri, 15 Sep 2017 00:00:00 -0500</pubDate>
         <link>http://storm.apache.org/2017/09/15/storm105-released.html</link>
         <guid isPermaLink="true">http://storm.apache.org/2017/09/15/storm105-released.html</guid>
         
@@ -798,10 +798,10 @@
       </item>
     
       <item>
-        <title>Storm 1.1.1 Released</title>
+        <title>Apache Storm 1.1.1 Released</title>
         <description>&lt;p&gt;The Apache Storm community is pleased to announce that version 1.1.1 has been released and is available from &lt;a href=&quot;/downloads.html&quot;&gt;the downloads page&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
+&lt;p&gt;This is a maintenance release that includes a number of important bug fixes that improve Apache Storm&amp;#39;s performance, stability and fault tolerance. We encourage users of previous versions to upgrade to this latest release.&lt;/p&gt;
 
 &lt;h2 id=&quot;thanks&quot;&gt;Thanks&lt;/h2&gt;
 
@@ -857,7 +857,7 @@
 &lt;li&gt;STORM-2432: Storm-Kafka-Client Trident Spout Seeks Incorrect Offset With UNCOMMITTED_LATEST Strategy&lt;/li&gt;
 &lt;/ul&gt;
 </description>
-        <pubDate>Tue, 01 Aug 2017 00:00:00 +0200</pubDate>
+        <pubDate>Tue, 01 Aug 2017 00:00:00 -0500</pubDate>
         <link>http://storm.apache.org/2017/08/01/storm111-released.html</link>
         <guid isPermaLink="true">http://storm.apache.org/2017/08/01/storm111-released.html</guid>
         
diff --git a/content/getting-help.html b/content/getting-help.html
index f84e8ba..858ba9e 100644
--- a/content/getting-help.html
+++ b/content/getting-help.html
@@ -175,8 +175,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -186,7 +186,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/index.html b/content/index.html
index 4ea9cd7..a78af7b 100644
--- a/content/index.html
+++ b/content/index.html
@@ -124,19 +124,19 @@
                     <ul class="latest-news">
                         <ul class="latest-news">
                         
-                        <li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a>&nbsp;<span class="small">(18 Jul 2019) </span></li>
+                        <li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a>&nbsp;<span class="small">(18 Jul 2019) </span></li>
                         
-                        <li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a>&nbsp;<span class="small">(30 May 2019) </span></li>
+                        <li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a>&nbsp;<span class="small">(30 May 2019) </span></li>
                         
-                        <li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a>&nbsp;<span class="small">(04 Jun 2018) </span></li>
+                        <li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a>&nbsp;<span class="small">(04 Jun 2018) </span></li>
                         
-                        <li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a>&nbsp;<span class="small">(04 Jun 2018) </span></li>
+                        <li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a>&nbsp;<span class="small">(04 Jun 2018) </span></li>
                         
-                        <li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a>&nbsp;<span class="small">(19 Feb 2018) </span></li>
+                        <li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a>&nbsp;<span class="small">(19 Feb 2018) </span></li>
                         
-                        <li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a>&nbsp;<span class="small">(15 Feb 2018) </span></li>
+                        <li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a>&nbsp;<span class="small">(15 Feb 2018) </span></li>
                         
-                        <li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a>&nbsp;<span class="small">(15 Feb 2018) </span></li>
+                        <li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a>&nbsp;<span class="small">(15 Feb 2018) </span></li>
                         
                     </ul> 
                     <p align="right"><a href="/2019/07/18/storm123-released.html" class="btn-std">More News</a></p>
@@ -146,10 +146,10 @@
         <div class="row">
           <div class="col-md-8">
               <div class="box-primary">
-                    <h4>Why use Storm?</h4>
-                  <p>Apache Storm is a free and open source distributed realtime computation system. Storm makes it easy to reliably process unbounded streams of data, doing for realtime processing what Hadoop did for batch processing. Storm is simple, can be used with any programming language, and is a lot of fun to use!</p>
-                    <p>Storm has many use cases: realtime analytics, online machine learning, continuous computation, distributed RPC, ETL, and more. Storm is fast: a benchmark clocked it at over <strong>a million tuples processed per second per node</strong>. It is scalable, fault-tolerant, guarantees your data will be processed, and is easy to set up and operate.</p>
-                    <p>Storm integrates with the queueing and database technologies you already use. A Storm topology consumes streams of data and processes those streams in arbitrarily complex ways, repartitioning the streams between each stage of the computation however needed. Read more in the tutorial.</p>
+                    <h4>Why use Apache Storm?</h4>
+                  <p>Apache Storm is a free and open source distributed realtime computation system. Apache Storm makes it easy to reliably process unbounded streams of data, doing for realtime processing what Hadoop did for batch processing. Apache Storm is simple, can be used with any programming language, and is a lot of fun to use!</p>
+                    <p>Apache Storm has many use cases: realtime analytics, online machine learning, continuous computation, distributed RPC, ETL, and more. Apache Storm is fast: a benchmark clocked it at over <strong>a million tuples processed per second per node</strong>. It is scalable, fault-tolerant, guarantees your data will be processed, and is easy to set up and operate.</p>
+                    <p>Apache Storm integrates with the queueing and database technologies you already use. An Apache Storm topology consumes streams of data and processes those streams in arbitrarily complex ways, repartitioning the streams between each stage of the computation however needed. Read more in the tutorial.</p>
                 </div>
             </div>
             <div class="col-md-4">
@@ -239,8 +239,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -250,7 +250,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/news.html b/content/news.html
index 6337606..28dd64a 100644
--- a/content/news.html
+++ b/content/news.html
@@ -110,61 +110,61 @@
     <div class="col-md-3">
         <ul class="news" id="news-list">
             
-      		<li><a href="/2019/07/18/storm123-released.html">Storm 1.2.3 Released</a></li>
+      		<li><a href="/2019/07/18/storm123-released.html">Apache Storm 1.2.3 Released</a></li>
     		
-      		<li><a href="/2019/05/30/storm200-released.html">Storm 2.0.0 Released</a></li>
+      		<li><a href="/2019/05/30/storm200-released.html">Apache Storm 2.0.0 Released</a></li>
     		
-      		<li><a href="/2018/06/04/storm122-released.html">Storm 1.2.2 Released</a></li>
+      		<li><a href="/2018/06/04/storm122-released.html">Apache Storm 1.2.2 Released</a></li>
     		
-      		<li><a href="/2018/06/04/storm113-released.html">Storm 1.1.3 Released</a></li>
+      		<li><a href="/2018/06/04/storm113-released.html">Apache Storm 1.1.3 Released</a></li>
     		
-      		<li><a href="/2018/02/19/storm121-released.html">Storm 1.2.1 Released</a></li>
+      		<li><a href="/2018/02/19/storm121-released.html">Apache Storm 1.2.1 Released</a></li>
     		
-      		<li><a href="/2018/02/15/storm120-released.html">Storm 1.2.0 Released</a></li>
+      		<li><a href="/2018/02/15/storm120-released.html">Apache Storm 1.2.0 Released</a></li>
     		
-      		<li><a href="/2018/02/15/storm112-released.html">Storm 1.1.2 Released</a></li>
+      		<li><a href="/2018/02/15/storm112-released.html">Apache Storm 1.1.2 Released</a></li>
     		
-      		<li><a href="/2018/02/14/storm106-released.html">Storm 1.0.6 Released</a></li>
+      		<li><a href="/2018/02/14/storm106-released.html">Apache Storm 1.0.6 Released</a></li>
     		
-      		<li><a href="/2017/09/15/storm105-released.html">Storm 1.0.5 Released</a></li>
+      		<li><a href="/2017/09/15/storm105-released.html">Apache Storm 1.0.5 Released</a></li>
     		
-      		<li><a href="/2017/08/01/storm111-released.html">Storm 1.1.1 Released</a></li>
+      		<li><a href="/2017/08/01/storm111-released.html">Apache Storm 1.1.1 Released</a></li>
     		
-      		<li><a href="/2017/07/28/storm104-released.html">Storm 1.0.4 Released</a></li>
+      		<li><a href="/2017/07/28/storm104-released.html">Apache Storm 1.0.4 Released</a></li>
     		
-      		<li><a href="/2017/03/29/storm110-released.html">Storm 1.1.0 released</a></li>
+      		<li><a href="/2017/03/29/storm110-released.html">Apache Storm 1.1.0 released</a></li>
     		
-      		<li><a href="/2017/02/14/storm103-released.html">Storm 1.0.3 Released</a></li>
+      		<li><a href="/2017/02/14/storm103-released.html">Apache Storm 1.0.3 Released</a></li>
     		
-      		<li><a href="/2016/09/14/storm0102-released.html">Storm 0.10.2 Released</a></li>
+      		<li><a href="/2016/09/14/storm0102-released.html">Apache Storm 0.10.2 Released</a></li>
     		
-      		<li><a href="/2016/09/07/storm097-released.html">Storm 0.9.7 Released</a></li>
+      		<li><a href="/2016/09/07/storm097-released.html">Apache Storm 0.9.7 Released</a></li>
     		
-      		<li><a href="/2016/08/10/storm102-released.html">Storm 1.0.2 Released</a></li>
+      		<li><a href="/2016/08/10/storm102-released.html">Apache Storm 1.0.2 Released</a></li>
     		
-      		<li><a href="/2016/05/06/storm101-released.html">Storm 1.0.1 Released</a></li>
+      		<li><a href="/2016/05/06/storm101-released.html">Apache Storm 1.0.1 Released</a></li>
     		
-      		<li><a href="/2016/05/05/storm0101-released.html">Storm 0.10.1 Released</a></li>
+      		<li><a href="/2016/05/05/storm0101-released.html">Apache Storm 0.10.1 Released</a></li>
     		
-      		<li><a href="/2016/04/12/storm100-released.html">Storm 1.0.0 released</a></li>
+      		<li><a href="/2016/04/12/storm100-released.html">Apache Storm 1.0.0 released</a></li>
     		
-      		<li><a href="/2015/11/05/storm096-released.html">Storm 0.9.6 released</a></li>
+      		<li><a href="/2015/11/05/storm096-released.html">Apache Storm 0.9.6 released</a></li>
     		
-      		<li><a href="/2015/11/05/storm0100-released.html">Storm 0.10.0 released</a></li>
+      		<li><a href="/2015/11/05/storm0100-released.html">Apache Storm 0.10.0 released</a></li>
     		
-      		<li><a href="/2015/06/15/storm0100-beta-released.html">Storm 0.10.0 Beta Released</a></li>
+      		<li><a href="/2015/06/15/storm0100-beta-released.html">Apache Storm 0.10.0 Beta Released</a></li>
     		
-      		<li><a href="/2015/06/04/storm095-released.html">Storm 0.9.5 released</a></li>
+      		<li><a href="/2015/06/04/storm095-released.html">Apache Storm 0.9.5 released</a></li>
     		
-      		<li><a href="/2015/03/25/storm094-released.html">Storm 0.9.4 released</a></li>
+      		<li><a href="/2015/03/25/storm094-released.html">Apache Storm 0.9.4 released</a></li>
     		
-      		<li><a href="/2014/11/25/storm093-released.html">Storm 0.9.3 released</a></li>
+      		<li><a href="/2014/11/25/storm093-released.html">Apache Storm 0.9.3 released</a></li>
     		
-      		<li><a href="/2014/10/20/storm093-release-candidate.html">Storm 0.9.3 release candidate 1 available</a></li>
+      		<li><a href="/2014/10/20/storm093-release-candidate.html">Apache Storm 0.9.3 release candidate 1 available</a></li>
     		
-      		<li><a href="/2014/06/25/storm092-released.html">Storm 0.9.2 released</a></li>
+      		<li><a href="/2014/06/25/storm092-released.html">Apache Storm 0.9.2 released</a></li>
     		
-      		<li><a href="/2014/06/17/contest-results.html">Storm Logo Contest Results</a></li>
+      		<li><a href="/2014/06/17/contest-results.html">Apache Storm Logo Contest Results</a></li>
     		
       		<li><a href="/2014/05/27/round1-results.html">Logo Contest - Round 1 Results</a></li>
     		
@@ -192,13 +192,13 @@
     		
       		<li><a href="/2014/04/10/storm-logo-contest.html">Apache Storm Logo Contest</a></li>
     		
-      		<li><a href="/2013/12/08/storm090-released.html">Storm 0.9.0 Released</a></li>
+      		<li><a href="/2013/12/08/storm090-released.html">Apache Storm 0.9.0 Released</a></li>
     		
-      		<li><a href="/2013/01/11/storm082-released.html">Storm 0.8.2 released</a></li>
+      		<li><a href="/2013/01/11/storm082-released.html">Apache Storm 0.8.2 released</a></li>
     		
-      		<li><a href="/2012/09/06/storm081-released.html">Storm 0.8.1 released</a></li>
+      		<li><a href="/2012/09/06/storm081-released.html">Apache Storm 0.8.1 released</a></li>
     		
-      		<li><a href="/2012/08/02/storm080-released.html">Storm 0.8.0 and Trident released</a></li>
+      		<li><a href="/2012/08/02/storm080-released.html">Apache Storm 0.8.0 and Trident released</a></li>
     		
         </ul>
     </div>
@@ -238,8 +238,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -249,7 +249,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Acking-framework-implementation.html b/content/releases/1.2.3/Acking-framework-implementation.html
index 2e1610e..7849d13 100644
--- a/content/releases/1.2.3/Acking-framework-implementation.html
+++ b/content/releases/1.2.3/Acking-framework-implementation.html
@@ -176,8 +176,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -187,7 +187,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Classpath-handling.html b/content/releases/1.2.3/Classpath-handling.html
index 09310ea..c43e9fb 100644
--- a/content/releases/1.2.3/Classpath-handling.html
+++ b/content/releases/1.2.3/Classpath-handling.html
@@ -169,8 +169,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -180,7 +180,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Clojure-DSL.html b/content/releases/1.2.3/Clojure-DSL.html
index 0337993..2ab2c3a 100644
--- a/content/releases/1.2.3/Clojure-DSL.html
+++ b/content/releases/1.2.3/Clojure-DSL.html
@@ -367,8 +367,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -378,7 +378,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Command-line-client.html b/content/releases/1.2.3/Command-line-client.html
index c7df5fd..94326bc 100644
--- a/content/releases/1.2.3/Command-line-client.html
+++ b/content/releases/1.2.3/Command-line-client.html
@@ -419,8 +419,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -430,7 +430,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Common-patterns.html b/content/releases/1.2.3/Common-patterns.html
index b7aeb5f..a2f0807 100644
--- a/content/releases/1.2.3/Common-patterns.html
+++ b/content/releases/1.2.3/Common-patterns.html
@@ -208,8 +208,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -219,7 +219,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Concepts.html b/content/releases/1.2.3/Concepts.html
index c6e3383..15f7988 100644
--- a/content/releases/1.2.3/Concepts.html
+++ b/content/releases/1.2.3/Concepts.html
@@ -264,8 +264,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -275,7 +275,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Configuration.html b/content/releases/1.2.3/Configuration.html
index 0da988a..4c56861 100644
--- a/content/releases/1.2.3/Configuration.html
+++ b/content/releases/1.2.3/Configuration.html
@@ -171,8 +171,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -182,7 +182,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Contributing-to-Storm.html b/content/releases/1.2.3/Contributing-to-Storm.html
index 3dc5e6c..1ae142e 100644
--- a/content/releases/1.2.3/Contributing-to-Storm.html
+++ b/content/releases/1.2.3/Contributing-to-Storm.html
@@ -168,8 +168,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -179,7 +179,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Creating-a-new-Storm-project.html b/content/releases/1.2.3/Creating-a-new-Storm-project.html
index a03e1e9..c084c6e 100644
--- a/content/releases/1.2.3/Creating-a-new-Storm-project.html
+++ b/content/releases/1.2.3/Creating-a-new-Storm-project.html
@@ -162,8 +162,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -173,7 +173,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/DSLs-and-multilang-adapters.html b/content/releases/1.2.3/DSLs-and-multilang-adapters.html
index a1c0740..df1e9f7 100644
--- a/content/releases/1.2.3/DSLs-and-multilang-adapters.html
+++ b/content/releases/1.2.3/DSLs-and-multilang-adapters.html
@@ -147,8 +147,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -158,7 +158,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Daemon-Fault-Tolerance.html b/content/releases/1.2.3/Daemon-Fault-Tolerance.html
index a700c0b..408c591 100644
--- a/content/releases/1.2.3/Daemon-Fault-Tolerance.html
+++ b/content/releases/1.2.3/Daemon-Fault-Tolerance.html
@@ -165,8 +165,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -176,7 +176,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Defining-a-non-jvm-language-dsl-for-storm.html b/content/releases/1.2.3/Defining-a-non-jvm-language-dsl-for-storm.html
index 258c3c9..7b1858b 100644
--- a/content/releases/1.2.3/Defining-a-non-jvm-language-dsl-for-storm.html
+++ b/content/releases/1.2.3/Defining-a-non-jvm-language-dsl-for-storm.html
@@ -161,8 +161,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -172,7 +172,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Distributed-RPC.html b/content/releases/1.2.3/Distributed-RPC.html
index 9687284..585c675 100644
--- a/content/releases/1.2.3/Distributed-RPC.html
+++ b/content/releases/1.2.3/Distributed-RPC.html
@@ -333,8 +333,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -344,7 +344,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Eventlogging.html b/content/releases/1.2.3/Eventlogging.html
index d81079b..0fb091b 100644
--- a/content/releases/1.2.3/Eventlogging.html
+++ b/content/releases/1.2.3/Eventlogging.html
@@ -265,8 +265,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -276,7 +276,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/FAQ.html b/content/releases/1.2.3/FAQ.html
index 5ad8554..2eeeadc 100644
--- a/content/releases/1.2.3/FAQ.html
+++ b/content/releases/1.2.3/FAQ.html
@@ -272,8 +272,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -283,7 +283,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Fault-tolerance.html b/content/releases/1.2.3/Fault-tolerance.html
index 8f62bbb..ed9ab5f 100644
--- a/content/releases/1.2.3/Fault-tolerance.html
+++ b/content/releases/1.2.3/Fault-tolerance.html
@@ -165,8 +165,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -176,7 +176,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Guaranteeing-message-processing.html b/content/releases/1.2.3/Guaranteeing-message-processing.html
index 3d88d2e..bf81bbd 100644
--- a/content/releases/1.2.3/Guaranteeing-message-processing.html
+++ b/content/releases/1.2.3/Guaranteeing-message-processing.html
@@ -297,8 +297,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -308,7 +308,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Hooks.html b/content/releases/1.2.3/Hooks.html
index 1157002..ffd1d18 100644
--- a/content/releases/1.2.3/Hooks.html
+++ b/content/releases/1.2.3/Hooks.html
@@ -152,8 +152,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -163,7 +163,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Implementation-docs.html b/content/releases/1.2.3/Implementation-docs.html
index 6256f45..f1400fc 100644
--- a/content/releases/1.2.3/Implementation-docs.html
+++ b/content/releases/1.2.3/Implementation-docs.html
@@ -150,8 +150,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -161,7 +161,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Installing-native-dependencies.html b/content/releases/1.2.3/Installing-native-dependencies.html
index 1bcaf7a..db0384d 100644
--- a/content/releases/1.2.3/Installing-native-dependencies.html
+++ b/content/releases/1.2.3/Installing-native-dependencies.html
@@ -171,8 +171,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -182,7 +182,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Joins.html b/content/releases/1.2.3/Joins.html
index 114738c..e1d1de7 100644
--- a/content/releases/1.2.3/Joins.html
+++ b/content/releases/1.2.3/Joins.html
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Kestrel-and-Storm.html b/content/releases/1.2.3/Kestrel-and-Storm.html
index 6d4240f..6200833 100644
--- a/content/releases/1.2.3/Kestrel-and-Storm.html
+++ b/content/releases/1.2.3/Kestrel-and-Storm.html
@@ -330,8 +330,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -341,7 +341,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Lifecycle-of-a-topology.html b/content/releases/1.2.3/Lifecycle-of-a-topology.html
index 27b5cfb..78fff7f 100644
--- a/content/releases/1.2.3/Lifecycle-of-a-topology.html
+++ b/content/releases/1.2.3/Lifecycle-of-a-topology.html
@@ -257,8 +257,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -268,7 +268,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Local-mode.html b/content/releases/1.2.3/Local-mode.html
index 92847dc..e3a14f1 100644
--- a/content/releases/1.2.3/Local-mode.html
+++ b/content/releases/1.2.3/Local-mode.html
@@ -160,8 +160,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -171,7 +171,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Logs.html b/content/releases/1.2.3/Logs.html
index 4e97d3d..15f66e1 100644
--- a/content/releases/1.2.3/Logs.html
+++ b/content/releases/1.2.3/Logs.html
@@ -167,8 +167,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -178,7 +178,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Maven.html b/content/releases/1.2.3/Maven.html
index fabc879..dec0407 100644
--- a/content/releases/1.2.3/Maven.html
+++ b/content/releases/1.2.3/Maven.html
@@ -153,8 +153,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -164,7 +164,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Message-passing-implementation.html b/content/releases/1.2.3/Message-passing-implementation.html
index cdbf731..3290807 100644
--- a/content/releases/1.2.3/Message-passing-implementation.html
+++ b/content/releases/1.2.3/Message-passing-implementation.html
@@ -182,8 +182,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -193,7 +193,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Metrics.html b/content/releases/1.2.3/Metrics.html
index f27dcb9..447de22 100644
--- a/content/releases/1.2.3/Metrics.html
+++ b/content/releases/1.2.3/Metrics.html
@@ -462,8 +462,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -473,7 +473,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Multilang-protocol.html b/content/releases/1.2.3/Multilang-protocol.html
index 1fe42cc..3140912 100644
--- a/content/releases/1.2.3/Multilang-protocol.html
+++ b/content/releases/1.2.3/Multilang-protocol.html
@@ -432,8 +432,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -443,7 +443,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Pacemaker.html b/content/releases/1.2.3/Pacemaker.html
index 2c63428..3cecaeb 100644
--- a/content/releases/1.2.3/Pacemaker.html
+++ b/content/releases/1.2.3/Pacemaker.html
@@ -254,8 +254,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -265,7 +265,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Powered-By.html b/content/releases/1.2.3/Powered-By.html
index ba6dc81..d0e14ca 100644
--- a/content/releases/1.2.3/Powered-By.html
+++ b/content/releases/1.2.3/Powered-By.html
@@ -1165,8 +1165,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -1176,7 +1176,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Project-ideas.html b/content/releases/1.2.3/Project-ideas.html
index 9bbd8cd..7764e32 100644
--- a/content/releases/1.2.3/Project-ideas.html
+++ b/content/releases/1.2.3/Project-ideas.html
@@ -145,8 +145,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -156,7 +156,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Rationale.html b/content/releases/1.2.3/Rationale.html
index 77a1812..11718e5 100644
--- a/content/releases/1.2.3/Rationale.html
+++ b/content/releases/1.2.3/Rationale.html
@@ -172,8 +172,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -183,7 +183,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Resource_Aware_Scheduler_overview.html b/content/releases/1.2.3/Resource_Aware_Scheduler_overview.html
index 5e5d85a..a973d7a 100644
--- a/content/releases/1.2.3/Resource_Aware_Scheduler_overview.html
+++ b/content/releases/1.2.3/Resource_Aware_Scheduler_overview.html
@@ -613,8 +613,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -624,7 +624,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Running-topologies-on-a-production-cluster.html b/content/releases/1.2.3/Running-topologies-on-a-production-cluster.html
index 53cbf7a..1b9e881 100644
--- a/content/releases/1.2.3/Running-topologies-on-a-production-cluster.html
+++ b/content/releases/1.2.3/Running-topologies-on-a-production-cluster.html
@@ -208,8 +208,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -219,7 +219,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/SECURITY.html b/content/releases/1.2.3/SECURITY.html
index d3edf16..928c6ed 100644
--- a/content/releases/1.2.3/SECURITY.html
+++ b/content/releases/1.2.3/SECURITY.html
@@ -703,8 +703,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -714,7 +714,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/STORM-UI-REST-API.html b/content/releases/1.2.3/STORM-UI-REST-API.html
index 6057d65..0ecb500 100644
--- a/content/releases/1.2.3/STORM-UI-REST-API.html
+++ b/content/releases/1.2.3/STORM-UI-REST-API.html
@@ -2932,8 +2932,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -2943,7 +2943,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git "a/content/releases/1.2.3/Serialization-\050prior-to-0.6.0\051.html" "b/content/releases/1.2.3/Serialization-\050prior-to-0.6.0\051.html"
index 6e65f8f..2e5d1ee 100644
--- "a/content/releases/1.2.3/Serialization-\050prior-to-0.6.0\051.html"
+++ "b/content/releases/1.2.3/Serialization-\050prior-to-0.6.0\051.html"
@@ -184,8 +184,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -195,7 +195,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Serialization.html b/content/releases/1.2.3/Serialization.html
index f893b62..8afa33a 100644
--- a/content/releases/1.2.3/Serialization.html
+++ b/content/releases/1.2.3/Serialization.html
@@ -196,8 +196,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -207,7 +207,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Serializers.html b/content/releases/1.2.3/Serializers.html
index 31aa55d..cbf15df 100644
--- a/content/releases/1.2.3/Serializers.html
+++ b/content/releases/1.2.3/Serializers.html
@@ -143,8 +143,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -154,7 +154,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Setting-up-a-Storm-cluster.html b/content/releases/1.2.3/Setting-up-a-Storm-cluster.html
index 8a0681a..d6eacee 100644
--- a/content/releases/1.2.3/Setting-up-a-Storm-cluster.html
+++ b/content/releases/1.2.3/Setting-up-a-Storm-cluster.html
@@ -242,8 +242,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -253,7 +253,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Setting-up-development-environment.html b/content/releases/1.2.3/Setting-up-development-environment.html
index 174d585..d31e50e 100644
--- a/content/releases/1.2.3/Setting-up-development-environment.html
+++ b/content/releases/1.2.3/Setting-up-development-environment.html
@@ -167,8 +167,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -178,7 +178,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Spout-implementations.html b/content/releases/1.2.3/Spout-implementations.html
index 738bd56..7efb8aa 100644
--- a/content/releases/1.2.3/Spout-implementations.html
+++ b/content/releases/1.2.3/Spout-implementations.html
@@ -147,8 +147,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -158,7 +158,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/State-checkpointing.html b/content/releases/1.2.3/State-checkpointing.html
index 198db86..e6964bf 100644
--- a/content/releases/1.2.3/State-checkpointing.html
+++ b/content/releases/1.2.3/State-checkpointing.html
@@ -415,8 +415,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -426,7 +426,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Storm-Scheduler.html b/content/releases/1.2.3/Storm-Scheduler.html
index c3e41a3..969cda4 100644
--- a/content/releases/1.2.3/Storm-Scheduler.html
+++ b/content/releases/1.2.3/Storm-Scheduler.html
@@ -159,8 +159,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -170,7 +170,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git "a/content/releases/1.2.3/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html" "b/content/releases/1.2.3/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html"
index 37aa3e6..7e7708f 100644
--- "a/content/releases/1.2.3/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html"
+++ "b/content/releases/1.2.3/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html"
@@ -249,8 +249,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -260,7 +260,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Structure-of-the-codebase.html b/content/releases/1.2.3/Structure-of-the-codebase.html
index 244bcaf..83f2e4f 100644
--- a/content/releases/1.2.3/Structure-of-the-codebase.html
+++ b/content/releases/1.2.3/Structure-of-the-codebase.html
@@ -283,8 +283,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -294,7 +294,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Support-for-non-java-languages.html b/content/releases/1.2.3/Support-for-non-java-languages.html
index 172b1dc..c7bcdc8 100644
--- a/content/releases/1.2.3/Support-for-non-java-languages.html
+++ b/content/releases/1.2.3/Support-for-non-java-languages.html
@@ -146,8 +146,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -157,7 +157,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Transactional-topologies.html b/content/releases/1.2.3/Transactional-topologies.html
index be00c22..ae79a34 100644
--- a/content/releases/1.2.3/Transactional-topologies.html
+++ b/content/releases/1.2.3/Transactional-topologies.html
@@ -506,8 +506,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -517,7 +517,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Trident-API-Overview.html b/content/releases/1.2.3/Trident-API-Overview.html
index c912cb7..dd00f0f 100644
--- a/content/releases/1.2.3/Trident-API-Overview.html
+++ b/content/releases/1.2.3/Trident-API-Overview.html
@@ -665,8 +665,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -676,7 +676,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Trident-RAS-API.html b/content/releases/1.2.3/Trident-RAS-API.html
index cdc7b44..1aa6b1b 100644
--- a/content/releases/1.2.3/Trident-RAS-API.html
+++ b/content/releases/1.2.3/Trident-RAS-API.html
@@ -188,8 +188,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -199,7 +199,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Trident-spouts.html b/content/releases/1.2.3/Trident-spouts.html
index 45f6088..aab772d 100644
--- a/content/releases/1.2.3/Trident-spouts.html
+++ b/content/releases/1.2.3/Trident-spouts.html
@@ -178,8 +178,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -189,7 +189,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Trident-state.html b/content/releases/1.2.3/Trident-state.html
index a700df7..9adde44 100644
--- a/content/releases/1.2.3/Trident-state.html
+++ b/content/releases/1.2.3/Trident-state.html
@@ -411,8 +411,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -422,7 +422,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Trident-tutorial.html b/content/releases/1.2.3/Trident-tutorial.html
index f3135e3..f04c2de 100644
--- a/content/releases/1.2.3/Trident-tutorial.html
+++ b/content/releases/1.2.3/Trident-tutorial.html
@@ -352,8 +352,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -363,7 +363,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Troubleshooting.html b/content/releases/1.2.3/Troubleshooting.html
index 8220abf..d315420 100644
--- a/content/releases/1.2.3/Troubleshooting.html
+++ b/content/releases/1.2.3/Troubleshooting.html
@@ -275,8 +275,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -286,7 +286,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Tutorial.html b/content/releases/1.2.3/Tutorial.html
index b6201ec..b5e855d 100644
--- a/content/releases/1.2.3/Tutorial.html
+++ b/content/releases/1.2.3/Tutorial.html
@@ -424,8 +424,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -435,7 +435,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Understanding-the-parallelism-of-a-Storm-topology.html b/content/releases/1.2.3/Understanding-the-parallelism-of-a-Storm-topology.html
index fd5cc51..a30a768 100644
--- a/content/releases/1.2.3/Understanding-the-parallelism-of-a-Storm-topology.html
+++ b/content/releases/1.2.3/Understanding-the-parallelism-of-a-Storm-topology.html
@@ -270,8 +270,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -281,7 +281,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Using-non-JVM-languages-with-Storm.html b/content/releases/1.2.3/Using-non-JVM-languages-with-Storm.html
index 715b853..f0c32a3 100644
--- a/content/releases/1.2.3/Using-non-JVM-languages-with-Storm.html
+++ b/content/releases/1.2.3/Using-non-JVM-languages-with-Storm.html
@@ -194,8 +194,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -205,7 +205,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/Windowing.html b/content/releases/1.2.3/Windowing.html
index ae77661..0cfd172 100644
--- a/content/releases/1.2.3/Windowing.html
+++ b/content/releases/1.2.3/Windowing.html
@@ -376,8 +376,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -387,7 +387,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/distcache-blobstore.html b/content/releases/1.2.3/distcache-blobstore.html
index ed2f212..87ca401 100644
--- a/content/releases/1.2.3/distcache-blobstore.html
+++ b/content/releases/1.2.3/distcache-blobstore.html
@@ -795,8 +795,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -806,7 +806,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/dynamic-log-level-settings.html b/content/releases/1.2.3/dynamic-log-level-settings.html
index f555c50..0725eb8 100644
--- a/content/releases/1.2.3/dynamic-log-level-settings.html
+++ b/content/releases/1.2.3/dynamic-log-level-settings.html
@@ -175,8 +175,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -186,7 +186,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/dynamic-worker-profiling.html b/content/releases/1.2.3/dynamic-worker-profiling.html
index af7bd9b..036cf22 100644
--- a/content/releases/1.2.3/dynamic-worker-profiling.html
+++ b/content/releases/1.2.3/dynamic-worker-profiling.html
@@ -167,8 +167,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -178,7 +178,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/flux.html b/content/releases/1.2.3/flux.html
index e5a44a1..d55be82 100644
--- a/content/releases/1.2.3/flux.html
+++ b/content/releases/1.2.3/flux.html
@@ -931,8 +931,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -942,7 +942,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/index.html b/content/releases/1.2.3/index.html
index eb1095f..d9b7382 100644
--- a/content/releases/1.2.3/index.html
+++ b/content/releases/1.2.3/index.html
@@ -282,8 +282,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -293,7 +293,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/metrics_v2.html b/content/releases/1.2.3/metrics_v2.html
index 6e0a26d..5a94111 100644
--- a/content/releases/1.2.3/metrics_v2.html
+++ b/content/releases/1.2.3/metrics_v2.html
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/nimbus-ha-design.html b/content/releases/1.2.3/nimbus-ha-design.html
index 1599c78..fe3c9a8 100644
--- a/content/releases/1.2.3/nimbus-ha-design.html
+++ b/content/releases/1.2.3/nimbus-ha-design.html
@@ -357,8 +357,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -368,7 +368,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-cassandra.html b/content/releases/1.2.3/storm-cassandra.html
index b1d2df2..2bcc54d 100644
--- a/content/releases/1.2.3/storm-cassandra.html
+++ b/content/releases/1.2.3/storm-cassandra.html
@@ -369,8 +369,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -380,7 +380,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-elasticsearch.html b/content/releases/1.2.3/storm-elasticsearch.html
index a2a931a..233c577 100644
--- a/content/releases/1.2.3/storm-elasticsearch.html
+++ b/content/releases/1.2.3/storm-elasticsearch.html
@@ -241,8 +241,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -252,7 +252,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-eventhubs.html b/content/releases/1.2.3/storm-eventhubs.html
index 23df366..35126b4 100644
--- a/content/releases/1.2.3/storm-eventhubs.html
+++ b/content/releases/1.2.3/storm-eventhubs.html
@@ -174,8 +174,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -185,7 +185,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-hbase.html b/content/releases/1.2.3/storm-hbase.html
index 8e86212..a1f2af2 100644
--- a/content/releases/1.2.3/storm-hbase.html
+++ b/content/releases/1.2.3/storm-hbase.html
@@ -364,8 +364,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -375,7 +375,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-hdfs.html b/content/releases/1.2.3/storm-hdfs.html
index 588632e..b1c9bcb 100644
--- a/content/releases/1.2.3/storm-hdfs.html
+++ b/content/releases/1.2.3/storm-hdfs.html
@@ -465,8 +465,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -476,7 +476,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-hive.html b/content/releases/1.2.3/storm-hive.html
index 09dc94e..9e44797 100644
--- a/content/releases/1.2.3/storm-hive.html
+++ b/content/releases/1.2.3/storm-hive.html
@@ -299,8 +299,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -310,7 +310,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-jdbc.html b/content/releases/1.2.3/storm-jdbc.html
index d58d071..b81720d 100644
--- a/content/releases/1.2.3/storm-jdbc.html
+++ b/content/releases/1.2.3/storm-jdbc.html
@@ -395,8 +395,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -406,7 +406,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-jms-example.html b/content/releases/1.2.3/storm-jms-example.html
index 7eeea17..62c8e18 100644
--- a/content/releases/1.2.3/storm-jms-example.html
+++ b/content/releases/1.2.3/storm-jms-example.html
@@ -244,8 +244,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -255,7 +255,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-jms-spring.html b/content/releases/1.2.3/storm-jms-spring.html
index 31514cd..5c0c56c 100644
--- a/content/releases/1.2.3/storm-jms-spring.html
+++ b/content/releases/1.2.3/storm-jms-spring.html
@@ -159,8 +159,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -170,7 +170,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-jms.html b/content/releases/1.2.3/storm-jms.html
index cf67fd5..ffa5111 100644
--- a/content/releases/1.2.3/storm-jms.html
+++ b/content/releases/1.2.3/storm-jms.html
@@ -165,8 +165,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -176,7 +176,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-kafka-client.html b/content/releases/1.2.3/storm-kafka-client.html
index 637b468..dafaac5 100644
--- a/content/releases/1.2.3/storm-kafka-client.html
+++ b/content/releases/1.2.3/storm-kafka-client.html
@@ -570,8 +570,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -581,7 +581,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-kafka.html b/content/releases/1.2.3/storm-kafka.html
index a87a32d..21ab16d 100644
--- a/content/releases/1.2.3/storm-kafka.html
+++ b/content/releases/1.2.3/storm-kafka.html
@@ -499,8 +499,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -510,7 +510,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-metrics-profiling-internal-actions.html b/content/releases/1.2.3/storm-metrics-profiling-internal-actions.html
index e08a42c..a37ab1e 100644
--- a/content/releases/1.2.3/storm-metrics-profiling-internal-actions.html
+++ b/content/releases/1.2.3/storm-metrics-profiling-internal-actions.html
@@ -207,8 +207,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -218,7 +218,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-mongodb.html b/content/releases/1.2.3/storm-mongodb.html
index 75eaee1..5845e28 100644
--- a/content/releases/1.2.3/storm-mongodb.html
+++ b/content/releases/1.2.3/storm-mongodb.html
@@ -294,8 +294,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -305,7 +305,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-mqtt.html b/content/releases/1.2.3/storm-mqtt.html
index 40ceac0..0df7a51 100644
--- a/content/releases/1.2.3/storm-mqtt.html
+++ b/content/releases/1.2.3/storm-mqtt.html
@@ -479,8 +479,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -490,7 +490,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-redis.html b/content/releases/1.2.3/storm-redis.html
index 0927189..8b84523 100644
--- a/content/releases/1.2.3/storm-redis.html
+++ b/content/releases/1.2.3/storm-redis.html
@@ -378,8 +378,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -389,7 +389,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-solr.html b/content/releases/1.2.3/storm-solr.html
index b625415..112a9de 100644
--- a/content/releases/1.2.3/storm-solr.html
+++ b/content/releases/1.2.3/storm-solr.html
@@ -304,8 +304,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -315,7 +315,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-sql-example.html b/content/releases/1.2.3/storm-sql-example.html
index 8801685..2b66ed6 100644
--- a/content/releases/1.2.3/storm-sql-example.html
+++ b/content/releases/1.2.3/storm-sql-example.html
@@ -375,8 +375,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -386,7 +386,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-sql-internal.html b/content/releases/1.2.3/storm-sql-internal.html
index 40b547b..79b05f1 100644
--- a/content/releases/1.2.3/storm-sql-internal.html
+++ b/content/releases/1.2.3/storm-sql-internal.html
@@ -191,8 +191,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -202,7 +202,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-sql-reference.html b/content/releases/1.2.3/storm-sql-reference.html
index 5e38301..d1c60e5 100644
--- a/content/releases/1.2.3/storm-sql-reference.html
+++ b/content/releases/1.2.3/storm-sql-reference.html
@@ -2097,8 +2097,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -2108,7 +2108,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/storm-sql.html b/content/releases/1.2.3/storm-sql.html
index b6d9f1a..76a5f15 100644
--- a/content/releases/1.2.3/storm-sql.html
+++ b/content/releases/1.2.3/storm-sql.html
@@ -280,8 +280,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -291,7 +291,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/1.2.3/windows-users-guide.html b/content/releases/1.2.3/windows-users-guide.html
index aef4da1..6fa2680 100644
--- a/content/releases/1.2.3/windows-users-guide.html
+++ b/content/releases/1.2.3/windows-users-guide.html
@@ -168,8 +168,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -179,7 +179,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Acking-framework-implementation.html b/content/releases/2.0.0/Acking-framework-implementation.html
index bba4eb0..757035e 100644
--- a/content/releases/2.0.0/Acking-framework-implementation.html
+++ b/content/releases/2.0.0/Acking-framework-implementation.html
@@ -176,8 +176,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -187,7 +187,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Classpath-handling.html b/content/releases/2.0.0/Classpath-handling.html
index 2d37a6d..dcba10b 100644
--- a/content/releases/2.0.0/Classpath-handling.html
+++ b/content/releases/2.0.0/Classpath-handling.html
@@ -169,8 +169,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -180,7 +180,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Clojure-DSL.html b/content/releases/2.0.0/Clojure-DSL.html
index 1a1adda..0516905 100644
--- a/content/releases/2.0.0/Clojure-DSL.html
+++ b/content/releases/2.0.0/Clojure-DSL.html
@@ -367,8 +367,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -378,7 +378,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/ClusterMetrics.html b/content/releases/2.0.0/ClusterMetrics.html
index a0fc154..5dcc4e4 100644
--- a/content/releases/2.0.0/ClusterMetrics.html
+++ b/content/releases/2.0.0/ClusterMetrics.html
@@ -1195,8 +1195,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -1206,7 +1206,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Command-line-client.html b/content/releases/2.0.0/Command-line-client.html
index 824159b..f9fbb4e 100644
--- a/content/releases/2.0.0/Command-line-client.html
+++ b/content/releases/2.0.0/Command-line-client.html
@@ -493,8 +493,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -504,7 +504,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Common-patterns.html b/content/releases/2.0.0/Common-patterns.html
index 2628531..6eaaf1d 100644
--- a/content/releases/2.0.0/Common-patterns.html
+++ b/content/releases/2.0.0/Common-patterns.html
@@ -208,8 +208,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -219,7 +219,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Concepts.html b/content/releases/2.0.0/Concepts.html
index d5fd0eb..bb3cb11 100644
--- a/content/releases/2.0.0/Concepts.html
+++ b/content/releases/2.0.0/Concepts.html
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Configuration.html b/content/releases/2.0.0/Configuration.html
index 793fcfc..672c5a9 100644
--- a/content/releases/2.0.0/Configuration.html
+++ b/content/releases/2.0.0/Configuration.html
@@ -183,8 +183,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -194,7 +194,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Contributing-to-Storm.html b/content/releases/2.0.0/Contributing-to-Storm.html
index fa9779e..5997b2a 100644
--- a/content/releases/2.0.0/Contributing-to-Storm.html
+++ b/content/releases/2.0.0/Contributing-to-Storm.html
@@ -168,8 +168,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -179,7 +179,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Creating-a-new-Storm-project.html b/content/releases/2.0.0/Creating-a-new-Storm-project.html
index c645ede..690b4ae 100644
--- a/content/releases/2.0.0/Creating-a-new-Storm-project.html
+++ b/content/releases/2.0.0/Creating-a-new-Storm-project.html
@@ -162,8 +162,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -173,7 +173,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/DSLs-and-multilang-adapters.html b/content/releases/2.0.0/DSLs-and-multilang-adapters.html
index 2b829a1..e1c7fc6 100644
--- a/content/releases/2.0.0/DSLs-and-multilang-adapters.html
+++ b/content/releases/2.0.0/DSLs-and-multilang-adapters.html
@@ -148,8 +148,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -159,7 +159,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Daemon-Fault-Tolerance.html b/content/releases/2.0.0/Daemon-Fault-Tolerance.html
index 25d69fb..1cc5160 100644
--- a/content/releases/2.0.0/Daemon-Fault-Tolerance.html
+++ b/content/releases/2.0.0/Daemon-Fault-Tolerance.html
@@ -165,8 +165,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -176,7 +176,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Defining-a-non-jvm-language-dsl-for-storm.html b/content/releases/2.0.0/Defining-a-non-jvm-language-dsl-for-storm.html
index 225a4f8..f66eb85 100644
--- a/content/releases/2.0.0/Defining-a-non-jvm-language-dsl-for-storm.html
+++ b/content/releases/2.0.0/Defining-a-non-jvm-language-dsl-for-storm.html
@@ -161,8 +161,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -172,7 +172,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Distributed-RPC.html b/content/releases/2.0.0/Distributed-RPC.html
index d636ae9..42a22ea 100644
--- a/content/releases/2.0.0/Distributed-RPC.html
+++ b/content/releases/2.0.0/Distributed-RPC.html
@@ -343,8 +343,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -354,7 +354,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Eventlogging.html b/content/releases/2.0.0/Eventlogging.html
index 98bc0a5..0814abf 100644
--- a/content/releases/2.0.0/Eventlogging.html
+++ b/content/releases/2.0.0/Eventlogging.html
@@ -265,8 +265,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -276,7 +276,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/FAQ.html b/content/releases/2.0.0/FAQ.html
index 95f3e33..0c0a918 100644
--- a/content/releases/2.0.0/FAQ.html
+++ b/content/releases/2.0.0/FAQ.html
@@ -272,8 +272,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -283,7 +283,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Fault-tolerance.html b/content/releases/2.0.0/Fault-tolerance.html
index 8c537ed..6be8aab 100644
--- a/content/releases/2.0.0/Fault-tolerance.html
+++ b/content/releases/2.0.0/Fault-tolerance.html
@@ -165,8 +165,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -176,7 +176,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Guaranteeing-message-processing.html b/content/releases/2.0.0/Guaranteeing-message-processing.html
index 7f573e0..167ed19 100644
--- a/content/releases/2.0.0/Guaranteeing-message-processing.html
+++ b/content/releases/2.0.0/Guaranteeing-message-processing.html
@@ -297,8 +297,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -308,7 +308,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Hooks.html b/content/releases/2.0.0/Hooks.html
index 5cc2d57..e3cb3d8 100644
--- a/content/releases/2.0.0/Hooks.html
+++ b/content/releases/2.0.0/Hooks.html
@@ -152,8 +152,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -163,7 +163,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/IConfigLoader.html b/content/releases/2.0.0/IConfigLoader.html
index 14a8026..93e88d5 100644
--- a/content/releases/2.0.0/IConfigLoader.html
+++ b/content/releases/2.0.0/IConfigLoader.html
@@ -191,8 +191,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -202,7 +202,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Implementation-docs.html b/content/releases/2.0.0/Implementation-docs.html
index f7ff46b..5844eff 100644
--- a/content/releases/2.0.0/Implementation-docs.html
+++ b/content/releases/2.0.0/Implementation-docs.html
@@ -151,8 +151,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -162,7 +162,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Installing-native-dependencies.html b/content/releases/2.0.0/Installing-native-dependencies.html
index 54b89d8..c16e2bb 100644
--- a/content/releases/2.0.0/Installing-native-dependencies.html
+++ b/content/releases/2.0.0/Installing-native-dependencies.html
@@ -171,8 +171,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -182,7 +182,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Joins.html b/content/releases/2.0.0/Joins.html
index 95096e7..8a13d34 100644
--- a/content/releases/2.0.0/Joins.html
+++ b/content/releases/2.0.0/Joins.html
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Kestrel-and-Storm.html b/content/releases/2.0.0/Kestrel-and-Storm.html
index e7d7faa..2bc07dd 100644
--- a/content/releases/2.0.0/Kestrel-and-Storm.html
+++ b/content/releases/2.0.0/Kestrel-and-Storm.html
@@ -329,8 +329,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -340,7 +340,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Lifecycle-of-a-topology.html b/content/releases/2.0.0/Lifecycle-of-a-topology.html
index 29a122d..d2fd33a 100644
--- a/content/releases/2.0.0/Lifecycle-of-a-topology.html
+++ b/content/releases/2.0.0/Lifecycle-of-a-topology.html
@@ -257,8 +257,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -268,7 +268,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Local-mode.html b/content/releases/2.0.0/Local-mode.html
index edce5e6..2ef97c3 100644
--- a/content/releases/2.0.0/Local-mode.html
+++ b/content/releases/2.0.0/Local-mode.html
@@ -211,8 +211,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -222,7 +222,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Logs.html b/content/releases/2.0.0/Logs.html
index 629b5f8..38e9bcd 100644
--- a/content/releases/2.0.0/Logs.html
+++ b/content/releases/2.0.0/Logs.html
@@ -167,8 +167,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -178,7 +178,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Maven.html b/content/releases/2.0.0/Maven.html
index 37dc45a..c177e94 100644
--- a/content/releases/2.0.0/Maven.html
+++ b/content/releases/2.0.0/Maven.html
@@ -153,8 +153,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -164,7 +164,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Message-passing-implementation.html b/content/releases/2.0.0/Message-passing-implementation.html
index 7a2c0d7..cd2dfed 100644
--- a/content/releases/2.0.0/Message-passing-implementation.html
+++ b/content/releases/2.0.0/Message-passing-implementation.html
@@ -182,8 +182,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -193,7 +193,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Metrics.html b/content/releases/2.0.0/Metrics.html
index 6eb2a2c..2c0ccb4 100644
--- a/content/releases/2.0.0/Metrics.html
+++ b/content/releases/2.0.0/Metrics.html
@@ -472,8 +472,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -483,7 +483,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Multilang-protocol.html b/content/releases/2.0.0/Multilang-protocol.html
index 387d394..5eef52f 100644
--- a/content/releases/2.0.0/Multilang-protocol.html
+++ b/content/releases/2.0.0/Multilang-protocol.html
@@ -448,8 +448,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -459,7 +459,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Pacemaker.html b/content/releases/2.0.0/Pacemaker.html
index 0a5bfa0..13f11f9 100644
--- a/content/releases/2.0.0/Pacemaker.html
+++ b/content/releases/2.0.0/Pacemaker.html
@@ -249,8 +249,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -260,7 +260,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Performance.html b/content/releases/2.0.0/Performance.html
index 8611bdb..f28a4a2 100644
--- a/content/releases/2.0.0/Performance.html
+++ b/content/releases/2.0.0/Performance.html
@@ -321,8 +321,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -332,7 +332,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Project-ideas.html b/content/releases/2.0.0/Project-ideas.html
index fdc73a4..f5e8c4a 100644
--- a/content/releases/2.0.0/Project-ideas.html
+++ b/content/releases/2.0.0/Project-ideas.html
@@ -145,8 +145,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -156,7 +156,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Rationale.html b/content/releases/2.0.0/Rationale.html
index 3e06337..3c45baf 100644
--- a/content/releases/2.0.0/Rationale.html
+++ b/content/releases/2.0.0/Rationale.html
@@ -172,8 +172,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -183,7 +183,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Resource_Aware_Scheduler_overview.html b/content/releases/2.0.0/Resource_Aware_Scheduler_overview.html
index 14eecb4..5b7b477 100644
--- a/content/releases/2.0.0/Resource_Aware_Scheduler_overview.html
+++ b/content/releases/2.0.0/Resource_Aware_Scheduler_overview.html
@@ -687,8 +687,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -698,7 +698,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Running-topologies-on-a-production-cluster.html b/content/releases/2.0.0/Running-topologies-on-a-production-cluster.html
index ca2d781..141053c 100644
--- a/content/releases/2.0.0/Running-topologies-on-a-production-cluster.html
+++ b/content/releases/2.0.0/Running-topologies-on-a-production-cluster.html
@@ -208,8 +208,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -219,7 +219,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/SECURITY.html b/content/releases/2.0.0/SECURITY.html
index ec1b9f4..cd1c331 100644
--- a/content/releases/2.0.0/SECURITY.html
+++ b/content/releases/2.0.0/SECURITY.html
@@ -767,8 +767,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -778,7 +778,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/STORM-UI-REST-API.html b/content/releases/2.0.0/STORM-UI-REST-API.html
index 5273583..b2a52a6 100644
--- a/content/releases/2.0.0/STORM-UI-REST-API.html
+++ b/content/releases/2.0.0/STORM-UI-REST-API.html
@@ -3108,8 +3108,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -3119,7 +3119,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git "a/content/releases/2.0.0/Serialization-\050prior-to-0.6.0\051.html" "b/content/releases/2.0.0/Serialization-\050prior-to-0.6.0\051.html"
index 76660ba..1b21472 100644
--- "a/content/releases/2.0.0/Serialization-\050prior-to-0.6.0\051.html"
+++ "b/content/releases/2.0.0/Serialization-\050prior-to-0.6.0\051.html"
@@ -184,8 +184,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -195,7 +195,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Serialization.html b/content/releases/2.0.0/Serialization.html
index 3d02666..73380dc 100644
--- a/content/releases/2.0.0/Serialization.html
+++ b/content/releases/2.0.0/Serialization.html
@@ -202,8 +202,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -213,7 +213,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Serializers.html b/content/releases/2.0.0/Serializers.html
index 492a08f..122360f 100644
--- a/content/releases/2.0.0/Serializers.html
+++ b/content/releases/2.0.0/Serializers.html
@@ -143,8 +143,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -154,7 +154,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Setting-up-a-Storm-cluster.html b/content/releases/2.0.0/Setting-up-a-Storm-cluster.html
index 3c74aa9..acbcf22 100644
--- a/content/releases/2.0.0/Setting-up-a-Storm-cluster.html
+++ b/content/releases/2.0.0/Setting-up-a-Storm-cluster.html
@@ -256,8 +256,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -267,7 +267,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Setting-up-development-environment.html b/content/releases/2.0.0/Setting-up-development-environment.html
index 32a6cd8..e07fe49 100644
--- a/content/releases/2.0.0/Setting-up-development-environment.html
+++ b/content/releases/2.0.0/Setting-up-development-environment.html
@@ -167,8 +167,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -178,7 +178,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Spout-implementations.html b/content/releases/2.0.0/Spout-implementations.html
index d853f1b..376750b 100644
--- a/content/releases/2.0.0/Spout-implementations.html
+++ b/content/releases/2.0.0/Spout-implementations.html
@@ -147,8 +147,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -158,7 +158,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/State-checkpointing.html b/content/releases/2.0.0/State-checkpointing.html
index 127f66a..d807549 100644
--- a/content/releases/2.0.0/State-checkpointing.html
+++ b/content/releases/2.0.0/State-checkpointing.html
@@ -417,8 +417,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -428,7 +428,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Storm-Scheduler.html b/content/releases/2.0.0/Storm-Scheduler.html
index 96fdb96..704e69d 100644
--- a/content/releases/2.0.0/Storm-Scheduler.html
+++ b/content/releases/2.0.0/Storm-Scheduler.html
@@ -159,8 +159,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -170,7 +170,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git "a/content/releases/2.0.0/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html" "b/content/releases/2.0.0/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html"
index 6279f1b..7abc5e8 100644
--- "a/content/releases/2.0.0/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html"
+++ "b/content/releases/2.0.0/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html"
@@ -249,8 +249,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -260,7 +260,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Stream-API.html b/content/releases/2.0.0/Stream-API.html
index 36e9c38..23a261b 100644
--- a/content/releases/2.0.0/Stream-API.html
+++ b/content/releases/2.0.0/Stream-API.html
@@ -561,8 +561,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -572,7 +572,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Structure-of-the-codebase.html b/content/releases/2.0.0/Structure-of-the-codebase.html
index 4a72d15..eb8464f 100644
--- a/content/releases/2.0.0/Structure-of-the-codebase.html
+++ b/content/releases/2.0.0/Structure-of-the-codebase.html
@@ -271,8 +271,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -282,7 +282,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Support-for-non-java-languages.html b/content/releases/2.0.0/Support-for-non-java-languages.html
index bb0932b..6bcdbdf 100644
--- a/content/releases/2.0.0/Support-for-non-java-languages.html
+++ b/content/releases/2.0.0/Support-for-non-java-languages.html
@@ -146,8 +146,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -157,7 +157,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Transactional-topologies.html b/content/releases/2.0.0/Transactional-topologies.html
index 4d67940..cec8a78 100644
--- a/content/releases/2.0.0/Transactional-topologies.html
+++ b/content/releases/2.0.0/Transactional-topologies.html
@@ -506,8 +506,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -517,7 +517,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Trident-API-Overview.html b/content/releases/2.0.0/Trident-API-Overview.html
index daebf52..127b58e 100644
--- a/content/releases/2.0.0/Trident-API-Overview.html
+++ b/content/releases/2.0.0/Trident-API-Overview.html
@@ -665,8 +665,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -676,7 +676,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Trident-RAS-API.html b/content/releases/2.0.0/Trident-RAS-API.html
index 7d1ea28..345b2be 100644
--- a/content/releases/2.0.0/Trident-RAS-API.html
+++ b/content/releases/2.0.0/Trident-RAS-API.html
@@ -188,8 +188,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -199,7 +199,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Trident-spouts.html b/content/releases/2.0.0/Trident-spouts.html
index b2dee38..48c92a1 100644
--- a/content/releases/2.0.0/Trident-spouts.html
+++ b/content/releases/2.0.0/Trident-spouts.html
@@ -178,8 +178,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -189,7 +189,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Trident-state.html b/content/releases/2.0.0/Trident-state.html
index 0304426..bb8ef48 100644
--- a/content/releases/2.0.0/Trident-state.html
+++ b/content/releases/2.0.0/Trident-state.html
@@ -411,8 +411,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -422,7 +422,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Trident-tutorial.html b/content/releases/2.0.0/Trident-tutorial.html
index edf0e3f..36c5a1c 100644
--- a/content/releases/2.0.0/Trident-tutorial.html
+++ b/content/releases/2.0.0/Trident-tutorial.html
@@ -354,8 +354,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -365,7 +365,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Troubleshooting.html b/content/releases/2.0.0/Troubleshooting.html
index d658402..6ed11b1 100644
--- a/content/releases/2.0.0/Troubleshooting.html
+++ b/content/releases/2.0.0/Troubleshooting.html
@@ -275,8 +275,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -286,7 +286,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Tutorial.html b/content/releases/2.0.0/Tutorial.html
index e59a800..3e46cba 100644
--- a/content/releases/2.0.0/Tutorial.html
+++ b/content/releases/2.0.0/Tutorial.html
@@ -398,8 +398,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -409,7 +409,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Understanding-the-parallelism-of-a-Storm-topology.html b/content/releases/2.0.0/Understanding-the-parallelism-of-a-Storm-topology.html
index f92d0d0..22b2979 100644
--- a/content/releases/2.0.0/Understanding-the-parallelism-of-a-Storm-topology.html
+++ b/content/releases/2.0.0/Understanding-the-parallelism-of-a-Storm-topology.html
@@ -270,8 +270,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -281,7 +281,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Using-non-JVM-languages-with-Storm.html b/content/releases/2.0.0/Using-non-JVM-languages-with-Storm.html
index 7fd5395..104e7c4 100644
--- a/content/releases/2.0.0/Using-non-JVM-languages-with-Storm.html
+++ b/content/releases/2.0.0/Using-non-JVM-languages-with-Storm.html
@@ -194,8 +194,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -205,7 +205,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/Windowing.html b/content/releases/2.0.0/Windowing.html
index 82eae43..1e298a5 100644
--- a/content/releases/2.0.0/Windowing.html
+++ b/content/releases/2.0.0/Windowing.html
@@ -475,8 +475,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -486,7 +486,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/cgroups_in_storm.html b/content/releases/2.0.0/cgroups_in_storm.html
index 5cd1c5c..b40f58d 100644
--- a/content/releases/2.0.0/cgroups_in_storm.html
+++ b/content/releases/2.0.0/cgroups_in_storm.html
@@ -311,8 +311,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -322,7 +322,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/distcache-blobstore.html b/content/releases/2.0.0/distcache-blobstore.html
index 8a03b65..6e0750e 100644
--- a/content/releases/2.0.0/distcache-blobstore.html
+++ b/content/releases/2.0.0/distcache-blobstore.html
@@ -795,8 +795,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -806,7 +806,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/dynamic-log-level-settings.html b/content/releases/2.0.0/dynamic-log-level-settings.html
index 9afa83a..7483bb5 100644
--- a/content/releases/2.0.0/dynamic-log-level-settings.html
+++ b/content/releases/2.0.0/dynamic-log-level-settings.html
@@ -175,8 +175,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -186,7 +186,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/dynamic-worker-profiling.html b/content/releases/2.0.0/dynamic-worker-profiling.html
index c1f3440..43edf6e 100644
--- a/content/releases/2.0.0/dynamic-worker-profiling.html
+++ b/content/releases/2.0.0/dynamic-worker-profiling.html
@@ -167,8 +167,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -178,7 +178,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/flux.html b/content/releases/2.0.0/flux.html
index 1d7d90d..f9d1388 100644
--- a/content/releases/2.0.0/flux.html
+++ b/content/releases/2.0.0/flux.html
@@ -909,8 +909,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -920,7 +920,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/index.html b/content/releases/2.0.0/index.html
index 61389e5..25c2650 100644
--- a/content/releases/2.0.0/index.html
+++ b/content/releases/2.0.0/index.html
@@ -284,8 +284,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -295,7 +295,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/metrics_v2.html b/content/releases/2.0.0/metrics_v2.html
index 0e07323..a2b2bb4 100644
--- a/content/releases/2.0.0/metrics_v2.html
+++ b/content/releases/2.0.0/metrics_v2.html
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/nimbus-ha-design.html b/content/releases/2.0.0/nimbus-ha-design.html
index 87a968f..5dfbd18 100644
--- a/content/releases/2.0.0/nimbus-ha-design.html
+++ b/content/releases/2.0.0/nimbus-ha-design.html
@@ -357,8 +357,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -368,7 +368,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-cassandra.html b/content/releases/2.0.0/storm-cassandra.html
index 9ee21e8..ed78f73 100644
--- a/content/releases/2.0.0/storm-cassandra.html
+++ b/content/releases/2.0.0/storm-cassandra.html
@@ -369,8 +369,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -380,7 +380,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-elasticsearch.html b/content/releases/2.0.0/storm-elasticsearch.html
index 7bb90da..79a8bf0 100644
--- a/content/releases/2.0.0/storm-elasticsearch.html
+++ b/content/releases/2.0.0/storm-elasticsearch.html
@@ -241,8 +241,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -252,7 +252,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-eventhubs.html b/content/releases/2.0.0/storm-eventhubs.html
index 28763d6..2a6b6cf 100644
--- a/content/releases/2.0.0/storm-eventhubs.html
+++ b/content/releases/2.0.0/storm-eventhubs.html
@@ -174,8 +174,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -185,7 +185,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-hbase.html b/content/releases/2.0.0/storm-hbase.html
index 550c32c..2114704 100644
--- a/content/releases/2.0.0/storm-hbase.html
+++ b/content/releases/2.0.0/storm-hbase.html
@@ -391,8 +391,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -402,7 +402,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-hdfs.html b/content/releases/2.0.0/storm-hdfs.html
index 1f69875..345f1cd 100644
--- a/content/releases/2.0.0/storm-hdfs.html
+++ b/content/releases/2.0.0/storm-hdfs.html
@@ -741,8 +741,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -752,7 +752,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-hive.html b/content/releases/2.0.0/storm-hive.html
index c20b161..e487daa 100644
--- a/content/releases/2.0.0/storm-hive.html
+++ b/content/releases/2.0.0/storm-hive.html
@@ -299,8 +299,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -310,7 +310,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-jdbc.html b/content/releases/2.0.0/storm-jdbc.html
index 9f8c807..ad24848 100644
--- a/content/releases/2.0.0/storm-jdbc.html
+++ b/content/releases/2.0.0/storm-jdbc.html
@@ -395,8 +395,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -406,7 +406,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-jms-example.html b/content/releases/2.0.0/storm-jms-example.html
index b0f15ea..798077f 100644
--- a/content/releases/2.0.0/storm-jms-example.html
+++ b/content/releases/2.0.0/storm-jms-example.html
@@ -244,8 +244,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -255,7 +255,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-jms-spring.html b/content/releases/2.0.0/storm-jms-spring.html
index b3ba9e2..9e9d55a 100644
--- a/content/releases/2.0.0/storm-jms-spring.html
+++ b/content/releases/2.0.0/storm-jms-spring.html
@@ -159,8 +159,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -170,7 +170,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-jms.html b/content/releases/2.0.0/storm-jms.html
index afeacfb..7915116 100644
--- a/content/releases/2.0.0/storm-jms.html
+++ b/content/releases/2.0.0/storm-jms.html
@@ -165,8 +165,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -176,7 +176,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-kafka-client.html b/content/releases/2.0.0/storm-kafka-client.html
index 60e9132..cdb562f 100644
--- a/content/releases/2.0.0/storm-kafka-client.html
+++ b/content/releases/2.0.0/storm-kafka-client.html
@@ -529,8 +529,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -540,7 +540,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-kinesis.html b/content/releases/2.0.0/storm-kinesis.html
index 16dbf34..6833e0c 100644
--- a/content/releases/2.0.0/storm-kinesis.html
+++ b/content/releases/2.0.0/storm-kinesis.html
@@ -279,8 +279,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -290,7 +290,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-metricstore.html b/content/releases/2.0.0/storm-metricstore.html
index 210a32e..c84f420 100644
--- a/content/releases/2.0.0/storm-metricstore.html
+++ b/content/releases/2.0.0/storm-metricstore.html
@@ -327,8 +327,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -338,7 +338,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-mongodb.html b/content/releases/2.0.0/storm-mongodb.html
index ff7e138..d559864 100644
--- a/content/releases/2.0.0/storm-mongodb.html
+++ b/content/releases/2.0.0/storm-mongodb.html
@@ -413,8 +413,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -424,7 +424,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-mqtt.html b/content/releases/2.0.0/storm-mqtt.html
index 3dfe1e2..e971655 100644
--- a/content/releases/2.0.0/storm-mqtt.html
+++ b/content/releases/2.0.0/storm-mqtt.html
@@ -479,8 +479,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -490,7 +490,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-opentsdb.html b/content/releases/2.0.0/storm-opentsdb.html
index 24d81cf..290ab66 100644
--- a/content/releases/2.0.0/storm-opentsdb.html
+++ b/content/releases/2.0.0/storm-opentsdb.html
@@ -184,8 +184,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -195,7 +195,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-pmml.html b/content/releases/2.0.0/storm-pmml.html
index b6cdfcd..5e434be 100644
--- a/content/releases/2.0.0/storm-pmml.html
+++ b/content/releases/2.0.0/storm-pmml.html
@@ -171,8 +171,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -182,7 +182,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-redis.html b/content/releases/2.0.0/storm-redis.html
index 929f70f..7fa027d 100644
--- a/content/releases/2.0.0/storm-redis.html
+++ b/content/releases/2.0.0/storm-redis.html
@@ -378,8 +378,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -389,7 +389,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-rocketmq.html b/content/releases/2.0.0/storm-rocketmq.html
index f030758..28a7ee3 100644
--- a/content/releases/2.0.0/storm-rocketmq.html
+++ b/content/releases/2.0.0/storm-rocketmq.html
@@ -222,8 +222,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -233,7 +233,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-solr.html b/content/releases/2.0.0/storm-solr.html
index c334ada..e538fff 100644
--- a/content/releases/2.0.0/storm-solr.html
+++ b/content/releases/2.0.0/storm-solr.html
@@ -304,8 +304,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -315,7 +315,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-sql-example.html b/content/releases/2.0.0/storm-sql-example.html
index c2cd7d8..84596c0 100644
--- a/content/releases/2.0.0/storm-sql-example.html
+++ b/content/releases/2.0.0/storm-sql-example.html
@@ -370,8 +370,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -381,7 +381,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-sql-internal.html b/content/releases/2.0.0/storm-sql-internal.html
index bac1876..86fd118 100644
--- a/content/releases/2.0.0/storm-sql-internal.html
+++ b/content/releases/2.0.0/storm-sql-internal.html
@@ -191,8 +191,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -202,7 +202,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-sql-reference.html b/content/releases/2.0.0/storm-sql-reference.html
index eb208fd..79d0b7a 100644
--- a/content/releases/2.0.0/storm-sql-reference.html
+++ b/content/releases/2.0.0/storm-sql-reference.html
@@ -2098,8 +2098,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -2109,7 +2109,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/storm-sql.html b/content/releases/2.0.0/storm-sql.html
index 878443a..5c065ad 100644
--- a/content/releases/2.0.0/storm-sql.html
+++ b/content/releases/2.0.0/storm-sql.html
@@ -307,8 +307,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -318,7 +318,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/2.0.0/windows-users-guide.html b/content/releases/2.0.0/windows-users-guide.html
index 4f61ae1..775a6a7 100644
--- a/content/releases/2.0.0/windows-users-guide.html
+++ b/content/releases/2.0.0/windows-users-guide.html
@@ -168,8 +168,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -179,7 +179,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Acking-framework-implementation.html b/content/releases/current/Acking-framework-implementation.html
index bba4eb0..757035e 100644
--- a/content/releases/current/Acking-framework-implementation.html
+++ b/content/releases/current/Acking-framework-implementation.html
@@ -176,8 +176,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -187,7 +187,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Classpath-handling.html b/content/releases/current/Classpath-handling.html
index 2d37a6d..dcba10b 100644
--- a/content/releases/current/Classpath-handling.html
+++ b/content/releases/current/Classpath-handling.html
@@ -169,8 +169,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -180,7 +180,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Clojure-DSL.html b/content/releases/current/Clojure-DSL.html
index 1a1adda..0516905 100644
--- a/content/releases/current/Clojure-DSL.html
+++ b/content/releases/current/Clojure-DSL.html
@@ -367,8 +367,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -378,7 +378,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/ClusterMetrics.html b/content/releases/current/ClusterMetrics.html
index a0fc154..5dcc4e4 100644
--- a/content/releases/current/ClusterMetrics.html
+++ b/content/releases/current/ClusterMetrics.html
@@ -1195,8 +1195,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -1206,7 +1206,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Command-line-client.html b/content/releases/current/Command-line-client.html
index 824159b..f9fbb4e 100644
--- a/content/releases/current/Command-line-client.html
+++ b/content/releases/current/Command-line-client.html
@@ -493,8 +493,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -504,7 +504,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Common-patterns.html b/content/releases/current/Common-patterns.html
index 2628531..6eaaf1d 100644
--- a/content/releases/current/Common-patterns.html
+++ b/content/releases/current/Common-patterns.html
@@ -208,8 +208,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -219,7 +219,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Concepts.html b/content/releases/current/Concepts.html
index d5fd0eb..bb3cb11 100644
--- a/content/releases/current/Concepts.html
+++ b/content/releases/current/Concepts.html
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Configuration.html b/content/releases/current/Configuration.html
index 793fcfc..672c5a9 100644
--- a/content/releases/current/Configuration.html
+++ b/content/releases/current/Configuration.html
@@ -183,8 +183,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -194,7 +194,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Contributing-to-Storm.html b/content/releases/current/Contributing-to-Storm.html
index fa9779e..5997b2a 100644
--- a/content/releases/current/Contributing-to-Storm.html
+++ b/content/releases/current/Contributing-to-Storm.html
@@ -168,8 +168,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -179,7 +179,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Creating-a-new-Storm-project.html b/content/releases/current/Creating-a-new-Storm-project.html
index c645ede..690b4ae 100644
--- a/content/releases/current/Creating-a-new-Storm-project.html
+++ b/content/releases/current/Creating-a-new-Storm-project.html
@@ -162,8 +162,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -173,7 +173,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/DSLs-and-multilang-adapters.html b/content/releases/current/DSLs-and-multilang-adapters.html
index 2b829a1..e1c7fc6 100644
--- a/content/releases/current/DSLs-and-multilang-adapters.html
+++ b/content/releases/current/DSLs-and-multilang-adapters.html
@@ -148,8 +148,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -159,7 +159,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Daemon-Fault-Tolerance.html b/content/releases/current/Daemon-Fault-Tolerance.html
index 25d69fb..1cc5160 100644
--- a/content/releases/current/Daemon-Fault-Tolerance.html
+++ b/content/releases/current/Daemon-Fault-Tolerance.html
@@ -165,8 +165,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -176,7 +176,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Defining-a-non-jvm-language-dsl-for-storm.html b/content/releases/current/Defining-a-non-jvm-language-dsl-for-storm.html
index 225a4f8..f66eb85 100644
--- a/content/releases/current/Defining-a-non-jvm-language-dsl-for-storm.html
+++ b/content/releases/current/Defining-a-non-jvm-language-dsl-for-storm.html
@@ -161,8 +161,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -172,7 +172,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Distributed-RPC.html b/content/releases/current/Distributed-RPC.html
index d636ae9..42a22ea 100644
--- a/content/releases/current/Distributed-RPC.html
+++ b/content/releases/current/Distributed-RPC.html
@@ -343,8 +343,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -354,7 +354,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Eventlogging.html b/content/releases/current/Eventlogging.html
index 98bc0a5..0814abf 100644
--- a/content/releases/current/Eventlogging.html
+++ b/content/releases/current/Eventlogging.html
@@ -265,8 +265,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -276,7 +276,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/FAQ.html b/content/releases/current/FAQ.html
index 95f3e33..0c0a918 100644
--- a/content/releases/current/FAQ.html
+++ b/content/releases/current/FAQ.html
@@ -272,8 +272,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -283,7 +283,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Fault-tolerance.html b/content/releases/current/Fault-tolerance.html
index 8c537ed..6be8aab 100644
--- a/content/releases/current/Fault-tolerance.html
+++ b/content/releases/current/Fault-tolerance.html
@@ -165,8 +165,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -176,7 +176,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Guaranteeing-message-processing.html b/content/releases/current/Guaranteeing-message-processing.html
index 7f573e0..167ed19 100644
--- a/content/releases/current/Guaranteeing-message-processing.html
+++ b/content/releases/current/Guaranteeing-message-processing.html
@@ -297,8 +297,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -308,7 +308,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Hooks.html b/content/releases/current/Hooks.html
index 5cc2d57..e3cb3d8 100644
--- a/content/releases/current/Hooks.html
+++ b/content/releases/current/Hooks.html
@@ -152,8 +152,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -163,7 +163,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/IConfigLoader.html b/content/releases/current/IConfigLoader.html
index 14a8026..93e88d5 100644
--- a/content/releases/current/IConfigLoader.html
+++ b/content/releases/current/IConfigLoader.html
@@ -191,8 +191,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -202,7 +202,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Implementation-docs.html b/content/releases/current/Implementation-docs.html
index f7ff46b..5844eff 100644
--- a/content/releases/current/Implementation-docs.html
+++ b/content/releases/current/Implementation-docs.html
@@ -151,8 +151,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -162,7 +162,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Installing-native-dependencies.html b/content/releases/current/Installing-native-dependencies.html
index 54b89d8..c16e2bb 100644
--- a/content/releases/current/Installing-native-dependencies.html
+++ b/content/releases/current/Installing-native-dependencies.html
@@ -171,8 +171,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -182,7 +182,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Joins.html b/content/releases/current/Joins.html
index 95096e7..8a13d34 100644
--- a/content/releases/current/Joins.html
+++ b/content/releases/current/Joins.html
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Kestrel-and-Storm.html b/content/releases/current/Kestrel-and-Storm.html
index e7d7faa..2bc07dd 100644
--- a/content/releases/current/Kestrel-and-Storm.html
+++ b/content/releases/current/Kestrel-and-Storm.html
@@ -329,8 +329,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -340,7 +340,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Lifecycle-of-a-topology.html b/content/releases/current/Lifecycle-of-a-topology.html
index 29a122d..d2fd33a 100644
--- a/content/releases/current/Lifecycle-of-a-topology.html
+++ b/content/releases/current/Lifecycle-of-a-topology.html
@@ -257,8 +257,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -268,7 +268,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Local-mode.html b/content/releases/current/Local-mode.html
index edce5e6..2ef97c3 100644
--- a/content/releases/current/Local-mode.html
+++ b/content/releases/current/Local-mode.html
@@ -211,8 +211,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -222,7 +222,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Logs.html b/content/releases/current/Logs.html
index 629b5f8..38e9bcd 100644
--- a/content/releases/current/Logs.html
+++ b/content/releases/current/Logs.html
@@ -167,8 +167,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -178,7 +178,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Maven.html b/content/releases/current/Maven.html
index 37dc45a..c177e94 100644
--- a/content/releases/current/Maven.html
+++ b/content/releases/current/Maven.html
@@ -153,8 +153,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -164,7 +164,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Message-passing-implementation.html b/content/releases/current/Message-passing-implementation.html
index 7a2c0d7..cd2dfed 100644
--- a/content/releases/current/Message-passing-implementation.html
+++ b/content/releases/current/Message-passing-implementation.html
@@ -182,8 +182,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -193,7 +193,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Metrics.html b/content/releases/current/Metrics.html
index 6eb2a2c..2c0ccb4 100644
--- a/content/releases/current/Metrics.html
+++ b/content/releases/current/Metrics.html
@@ -472,8 +472,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -483,7 +483,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Multilang-protocol.html b/content/releases/current/Multilang-protocol.html
index 387d394..5eef52f 100644
--- a/content/releases/current/Multilang-protocol.html
+++ b/content/releases/current/Multilang-protocol.html
@@ -448,8 +448,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -459,7 +459,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Pacemaker.html b/content/releases/current/Pacemaker.html
index 0a5bfa0..13f11f9 100644
--- a/content/releases/current/Pacemaker.html
+++ b/content/releases/current/Pacemaker.html
@@ -249,8 +249,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -260,7 +260,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Performance.html b/content/releases/current/Performance.html
index 8611bdb..f28a4a2 100644
--- a/content/releases/current/Performance.html
+++ b/content/releases/current/Performance.html
@@ -321,8 +321,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -332,7 +332,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Project-ideas.html b/content/releases/current/Project-ideas.html
index fdc73a4..f5e8c4a 100644
--- a/content/releases/current/Project-ideas.html
+++ b/content/releases/current/Project-ideas.html
@@ -145,8 +145,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -156,7 +156,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Rationale.html b/content/releases/current/Rationale.html
index 3e06337..3c45baf 100644
--- a/content/releases/current/Rationale.html
+++ b/content/releases/current/Rationale.html
@@ -172,8 +172,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -183,7 +183,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Resource_Aware_Scheduler_overview.html b/content/releases/current/Resource_Aware_Scheduler_overview.html
index 14eecb4..5b7b477 100644
--- a/content/releases/current/Resource_Aware_Scheduler_overview.html
+++ b/content/releases/current/Resource_Aware_Scheduler_overview.html
@@ -687,8 +687,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -698,7 +698,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Running-topologies-on-a-production-cluster.html b/content/releases/current/Running-topologies-on-a-production-cluster.html
index ca2d781..141053c 100644
--- a/content/releases/current/Running-topologies-on-a-production-cluster.html
+++ b/content/releases/current/Running-topologies-on-a-production-cluster.html
@@ -208,8 +208,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -219,7 +219,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/SECURITY.html b/content/releases/current/SECURITY.html
index ec1b9f4..cd1c331 100644
--- a/content/releases/current/SECURITY.html
+++ b/content/releases/current/SECURITY.html
@@ -767,8 +767,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -778,7 +778,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/STORM-UI-REST-API.html b/content/releases/current/STORM-UI-REST-API.html
index 5273583..b2a52a6 100644
--- a/content/releases/current/STORM-UI-REST-API.html
+++ b/content/releases/current/STORM-UI-REST-API.html
@@ -3108,8 +3108,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -3119,7 +3119,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git "a/content/releases/current/Serialization-\050prior-to-0.6.0\051.html" "b/content/releases/current/Serialization-\050prior-to-0.6.0\051.html"
index 76660ba..1b21472 100644
--- "a/content/releases/current/Serialization-\050prior-to-0.6.0\051.html"
+++ "b/content/releases/current/Serialization-\050prior-to-0.6.0\051.html"
@@ -184,8 +184,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -195,7 +195,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Serialization.html b/content/releases/current/Serialization.html
index 3d02666..73380dc 100644
--- a/content/releases/current/Serialization.html
+++ b/content/releases/current/Serialization.html
@@ -202,8 +202,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -213,7 +213,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Serializers.html b/content/releases/current/Serializers.html
index 492a08f..122360f 100644
--- a/content/releases/current/Serializers.html
+++ b/content/releases/current/Serializers.html
@@ -143,8 +143,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -154,7 +154,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Setting-up-a-Storm-cluster.html b/content/releases/current/Setting-up-a-Storm-cluster.html
index 3c74aa9..acbcf22 100644
--- a/content/releases/current/Setting-up-a-Storm-cluster.html
+++ b/content/releases/current/Setting-up-a-Storm-cluster.html
@@ -256,8 +256,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -267,7 +267,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Setting-up-development-environment.html b/content/releases/current/Setting-up-development-environment.html
index 32a6cd8..e07fe49 100644
--- a/content/releases/current/Setting-up-development-environment.html
+++ b/content/releases/current/Setting-up-development-environment.html
@@ -167,8 +167,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -178,7 +178,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Spout-implementations.html b/content/releases/current/Spout-implementations.html
index d853f1b..376750b 100644
--- a/content/releases/current/Spout-implementations.html
+++ b/content/releases/current/Spout-implementations.html
@@ -147,8 +147,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -158,7 +158,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/State-checkpointing.html b/content/releases/current/State-checkpointing.html
index 127f66a..d807549 100644
--- a/content/releases/current/State-checkpointing.html
+++ b/content/releases/current/State-checkpointing.html
@@ -417,8 +417,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -428,7 +428,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Storm-Scheduler.html b/content/releases/current/Storm-Scheduler.html
index 96fdb96..704e69d 100644
--- a/content/releases/current/Storm-Scheduler.html
+++ b/content/releases/current/Storm-Scheduler.html
@@ -159,8 +159,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -170,7 +170,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git "a/content/releases/current/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html" "b/content/releases/current/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html"
index 6279f1b..7abc5e8 100644
--- "a/content/releases/current/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html"
+++ "b/content/releases/current/Storm-multi-language-protocol-\050versions-0.7.0-and-below\051.html"
@@ -249,8 +249,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -260,7 +260,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Stream-API.html b/content/releases/current/Stream-API.html
index 36e9c38..23a261b 100644
--- a/content/releases/current/Stream-API.html
+++ b/content/releases/current/Stream-API.html
@@ -561,8 +561,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -572,7 +572,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Structure-of-the-codebase.html b/content/releases/current/Structure-of-the-codebase.html
index 4a72d15..eb8464f 100644
--- a/content/releases/current/Structure-of-the-codebase.html
+++ b/content/releases/current/Structure-of-the-codebase.html
@@ -271,8 +271,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -282,7 +282,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Support-for-non-java-languages.html b/content/releases/current/Support-for-non-java-languages.html
index bb0932b..6bcdbdf 100644
--- a/content/releases/current/Support-for-non-java-languages.html
+++ b/content/releases/current/Support-for-non-java-languages.html
@@ -146,8 +146,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -157,7 +157,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Transactional-topologies.html b/content/releases/current/Transactional-topologies.html
index 4d67940..cec8a78 100644
--- a/content/releases/current/Transactional-topologies.html
+++ b/content/releases/current/Transactional-topologies.html
@@ -506,8 +506,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -517,7 +517,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Trident-API-Overview.html b/content/releases/current/Trident-API-Overview.html
index daebf52..127b58e 100644
--- a/content/releases/current/Trident-API-Overview.html
+++ b/content/releases/current/Trident-API-Overview.html
@@ -665,8 +665,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -676,7 +676,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Trident-RAS-API.html b/content/releases/current/Trident-RAS-API.html
index 7d1ea28..345b2be 100644
--- a/content/releases/current/Trident-RAS-API.html
+++ b/content/releases/current/Trident-RAS-API.html
@@ -188,8 +188,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -199,7 +199,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Trident-spouts.html b/content/releases/current/Trident-spouts.html
index b2dee38..48c92a1 100644
--- a/content/releases/current/Trident-spouts.html
+++ b/content/releases/current/Trident-spouts.html
@@ -178,8 +178,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -189,7 +189,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Trident-state.html b/content/releases/current/Trident-state.html
index 0304426..bb8ef48 100644
--- a/content/releases/current/Trident-state.html
+++ b/content/releases/current/Trident-state.html
@@ -411,8 +411,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -422,7 +422,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Trident-tutorial.html b/content/releases/current/Trident-tutorial.html
index edf0e3f..36c5a1c 100644
--- a/content/releases/current/Trident-tutorial.html
+++ b/content/releases/current/Trident-tutorial.html
@@ -354,8 +354,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -365,7 +365,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Troubleshooting.html b/content/releases/current/Troubleshooting.html
index d658402..6ed11b1 100644
--- a/content/releases/current/Troubleshooting.html
+++ b/content/releases/current/Troubleshooting.html
@@ -275,8 +275,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -286,7 +286,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Tutorial.html b/content/releases/current/Tutorial.html
index e59a800..3e46cba 100644
--- a/content/releases/current/Tutorial.html
+++ b/content/releases/current/Tutorial.html
@@ -398,8 +398,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -409,7 +409,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Understanding-the-parallelism-of-a-Storm-topology.html b/content/releases/current/Understanding-the-parallelism-of-a-Storm-topology.html
index f92d0d0..22b2979 100644
--- a/content/releases/current/Understanding-the-parallelism-of-a-Storm-topology.html
+++ b/content/releases/current/Understanding-the-parallelism-of-a-Storm-topology.html
@@ -270,8 +270,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -281,7 +281,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Using-non-JVM-languages-with-Storm.html b/content/releases/current/Using-non-JVM-languages-with-Storm.html
index 7fd5395..104e7c4 100644
--- a/content/releases/current/Using-non-JVM-languages-with-Storm.html
+++ b/content/releases/current/Using-non-JVM-languages-with-Storm.html
@@ -194,8 +194,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -205,7 +205,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/Windowing.html b/content/releases/current/Windowing.html
index 82eae43..1e298a5 100644
--- a/content/releases/current/Windowing.html
+++ b/content/releases/current/Windowing.html
@@ -475,8 +475,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -486,7 +486,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/cgroups_in_storm.html b/content/releases/current/cgroups_in_storm.html
index 5cd1c5c..b40f58d 100644
--- a/content/releases/current/cgroups_in_storm.html
+++ b/content/releases/current/cgroups_in_storm.html
@@ -311,8 +311,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -322,7 +322,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/distcache-blobstore.html b/content/releases/current/distcache-blobstore.html
index 8a03b65..6e0750e 100644
--- a/content/releases/current/distcache-blobstore.html
+++ b/content/releases/current/distcache-blobstore.html
@@ -795,8 +795,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -806,7 +806,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/dynamic-log-level-settings.html b/content/releases/current/dynamic-log-level-settings.html
index 9afa83a..7483bb5 100644
--- a/content/releases/current/dynamic-log-level-settings.html
+++ b/content/releases/current/dynamic-log-level-settings.html
@@ -175,8 +175,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -186,7 +186,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/dynamic-worker-profiling.html b/content/releases/current/dynamic-worker-profiling.html
index c1f3440..43edf6e 100644
--- a/content/releases/current/dynamic-worker-profiling.html
+++ b/content/releases/current/dynamic-worker-profiling.html
@@ -167,8 +167,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -178,7 +178,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/flux.html b/content/releases/current/flux.html
index 1d7d90d..f9d1388 100644
--- a/content/releases/current/flux.html
+++ b/content/releases/current/flux.html
@@ -909,8 +909,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -920,7 +920,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/images/logos/yahoo.png b/content/releases/current/images/logos/yahoo.png
old mode 100755
new mode 100644
Binary files differ
diff --git a/content/releases/current/index.html b/content/releases/current/index.html
index 61389e5..25c2650 100644
--- a/content/releases/current/index.html
+++ b/content/releases/current/index.html
@@ -284,8 +284,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -295,7 +295,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/metrics_v2.html b/content/releases/current/metrics_v2.html
index 0e07323..a2b2bb4 100644
--- a/content/releases/current/metrics_v2.html
+++ b/content/releases/current/metrics_v2.html
@@ -268,8 +268,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -279,7 +279,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/nimbus-ha-design.html b/content/releases/current/nimbus-ha-design.html
index 87a968f..5dfbd18 100644
--- a/content/releases/current/nimbus-ha-design.html
+++ b/content/releases/current/nimbus-ha-design.html
@@ -357,8 +357,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -368,7 +368,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-cassandra.html b/content/releases/current/storm-cassandra.html
index 9ee21e8..ed78f73 100644
--- a/content/releases/current/storm-cassandra.html
+++ b/content/releases/current/storm-cassandra.html
@@ -369,8 +369,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -380,7 +380,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-elasticsearch.html b/content/releases/current/storm-elasticsearch.html
index 7bb90da..79a8bf0 100644
--- a/content/releases/current/storm-elasticsearch.html
+++ b/content/releases/current/storm-elasticsearch.html
@@ -241,8 +241,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -252,7 +252,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-eventhubs.html b/content/releases/current/storm-eventhubs.html
index 28763d6..2a6b6cf 100644
--- a/content/releases/current/storm-eventhubs.html
+++ b/content/releases/current/storm-eventhubs.html
@@ -174,8 +174,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -185,7 +185,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-hbase.html b/content/releases/current/storm-hbase.html
index 550c32c..2114704 100644
--- a/content/releases/current/storm-hbase.html
+++ b/content/releases/current/storm-hbase.html
@@ -391,8 +391,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -402,7 +402,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-hdfs.html b/content/releases/current/storm-hdfs.html
index 1f69875..345f1cd 100644
--- a/content/releases/current/storm-hdfs.html
+++ b/content/releases/current/storm-hdfs.html
@@ -741,8 +741,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -752,7 +752,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-hive.html b/content/releases/current/storm-hive.html
index c20b161..e487daa 100644
--- a/content/releases/current/storm-hive.html
+++ b/content/releases/current/storm-hive.html
@@ -299,8 +299,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -310,7 +310,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-jdbc.html b/content/releases/current/storm-jdbc.html
index 9f8c807..ad24848 100644
--- a/content/releases/current/storm-jdbc.html
+++ b/content/releases/current/storm-jdbc.html
@@ -395,8 +395,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -406,7 +406,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-jms-example.html b/content/releases/current/storm-jms-example.html
index b0f15ea..798077f 100644
--- a/content/releases/current/storm-jms-example.html
+++ b/content/releases/current/storm-jms-example.html
@@ -244,8 +244,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -255,7 +255,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-jms-spring.html b/content/releases/current/storm-jms-spring.html
index b3ba9e2..9e9d55a 100644
--- a/content/releases/current/storm-jms-spring.html
+++ b/content/releases/current/storm-jms-spring.html
@@ -159,8 +159,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -170,7 +170,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-jms.html b/content/releases/current/storm-jms.html
index afeacfb..7915116 100644
--- a/content/releases/current/storm-jms.html
+++ b/content/releases/current/storm-jms.html
@@ -165,8 +165,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -176,7 +176,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-kafka-client.html b/content/releases/current/storm-kafka-client.html
index 60e9132..cdb562f 100644
--- a/content/releases/current/storm-kafka-client.html
+++ b/content/releases/current/storm-kafka-client.html
@@ -529,8 +529,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -540,7 +540,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-kinesis.html b/content/releases/current/storm-kinesis.html
index 16dbf34..6833e0c 100644
--- a/content/releases/current/storm-kinesis.html
+++ b/content/releases/current/storm-kinesis.html
@@ -279,8 +279,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -290,7 +290,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-metricstore.html b/content/releases/current/storm-metricstore.html
index 210a32e..c84f420 100644
--- a/content/releases/current/storm-metricstore.html
+++ b/content/releases/current/storm-metricstore.html
@@ -327,8 +327,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -338,7 +338,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-mongodb.html b/content/releases/current/storm-mongodb.html
index ff7e138..d559864 100644
--- a/content/releases/current/storm-mongodb.html
+++ b/content/releases/current/storm-mongodb.html
@@ -413,8 +413,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -424,7 +424,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-mqtt.html b/content/releases/current/storm-mqtt.html
index 3dfe1e2..e971655 100644
--- a/content/releases/current/storm-mqtt.html
+++ b/content/releases/current/storm-mqtt.html
@@ -479,8 +479,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -490,7 +490,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-opentsdb.html b/content/releases/current/storm-opentsdb.html
index 24d81cf..290ab66 100644
--- a/content/releases/current/storm-opentsdb.html
+++ b/content/releases/current/storm-opentsdb.html
@@ -184,8 +184,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -195,7 +195,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-pmml.html b/content/releases/current/storm-pmml.html
index b6cdfcd..5e434be 100644
--- a/content/releases/current/storm-pmml.html
+++ b/content/releases/current/storm-pmml.html
@@ -171,8 +171,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -182,7 +182,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-redis.html b/content/releases/current/storm-redis.html
index 929f70f..7fa027d 100644
--- a/content/releases/current/storm-redis.html
+++ b/content/releases/current/storm-redis.html
@@ -378,8 +378,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -389,7 +389,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-rocketmq.html b/content/releases/current/storm-rocketmq.html
index f030758..28a7ee3 100644
--- a/content/releases/current/storm-rocketmq.html
+++ b/content/releases/current/storm-rocketmq.html
@@ -222,8 +222,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -233,7 +233,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-solr.html b/content/releases/current/storm-solr.html
index c334ada..e538fff 100644
--- a/content/releases/current/storm-solr.html
+++ b/content/releases/current/storm-solr.html
@@ -304,8 +304,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -315,7 +315,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-sql-example.html b/content/releases/current/storm-sql-example.html
index c2cd7d8..84596c0 100644
--- a/content/releases/current/storm-sql-example.html
+++ b/content/releases/current/storm-sql-example.html
@@ -370,8 +370,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -381,7 +381,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-sql-internal.html b/content/releases/current/storm-sql-internal.html
index bac1876..86fd118 100644
--- a/content/releases/current/storm-sql-internal.html
+++ b/content/releases/current/storm-sql-internal.html
@@ -191,8 +191,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -202,7 +202,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-sql-reference.html b/content/releases/current/storm-sql-reference.html
index eb208fd..79d0b7a 100644
--- a/content/releases/current/storm-sql-reference.html
+++ b/content/releases/current/storm-sql-reference.html
@@ -2098,8 +2098,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -2109,7 +2109,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/storm-sql.html b/content/releases/current/storm-sql.html
index 878443a..5c065ad 100644
--- a/content/releases/current/storm-sql.html
+++ b/content/releases/current/storm-sql.html
@@ -307,8 +307,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -318,7 +318,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/releases/current/windows-users-guide.html b/content/releases/current/windows-users-guide.html
index 4f61ae1..775a6a7 100644
--- a/content/releases/current/windows-users-guide.html
+++ b/content/releases/current/windows-users-guide.html
@@ -168,8 +168,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -179,7 +179,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/content/talksAndVideos.html b/content/talksAndVideos.html
index c72de26..1ef423c 100644
--- a/content/talksAndVideos.html
+++ b/content/talksAndVideos.html
@@ -562,8 +562,8 @@
             </div>
             <div class="col-md-3">
                 <div class="footer-widget">
-                    <h5>About Storm</h5>
-                    <p>Storm integrates with any queueing system and any database system. Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Storm with database systems is easy.</p>
+                    <h5>About Apache Storm</h5>
+                    <p>Apache Storm integrates with any queueing system and any database system. Apache Storm's spout abstraction makes it easy to integrate a new queuing system. Likewise, integrating Apache Storm with database systems is easy.</p>
                </div>
             </div>
             <div class="col-md-3">
@@ -573,7 +573,7 @@
                         <li><a href="/releases/current/Rationale.html">Rationale</a></li>
                         <li><a href="/releases/current/Tutorial.html">Tutorial</a></li>
                         <li><a href="/releases/current/Setting-up-development-environment.html">Setting up development environment</a></li>
-                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Storm project</a></li>
+                        <li><a href="/releases/current/Creating-a-new-Storm-project.html">Creating a new Apache Storm project</a></li>
                     </ul>
                 </div>
             </div>
diff --git a/downloads.html b/downloads.html
index 02c752d..a54da93 100644
--- a/downloads.html
+++ b/downloads.html
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Storm downloads
+title: Apache Storm downloads
 older:
   - 0.8.1: smesqx9uwa7f0qk
   - 0.8.0: a6lgds9wbki04d2
@@ -23,7 +23,7 @@
     	<div class="row">
         	<div class="col-md-12">
 				  <p>
-				  Downloads for Apache Storm are below. Instructions for how to set up a Storm cluster can be found <a href="/documentation/Setting-up-a-Storm-cluster.html">here</a>.
+				  Downloads for Apache Storm are below. Instructions for how to set up an Apache Storm cluster can be found <a href="/documentation/Setting-up-a-Storm-cluster.html">here</a>.
 				  </p>
               
 				  <h3>Current 2.0.x Release</h3>
@@ -52,7 +52,7 @@
 					     [<a href="https://www.apache.org/dist/storm/apache-storm-2.0.0/apache-storm-2.0.0-src.zip.sha512">SHA512</a>] 
 					  </li>
 				  </ul>
-				  Storm artifacts are hosted in <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">Maven Central</a>. You can add Storm as a dependency with the following coordinates:
+				  Apache Storm artifacts are hosted in <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">Maven Central</a>. You can add Apache Storm as a dependency with the following coordinates:
 
 				  <pre>
 groupId: <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">org.apache.storm</a>
@@ -85,7 +85,7 @@
 					     [<a href="https://www.apache.org/dist/storm/apache-storm-1.2.3/apache-storm-1.2.3-src.zip.sha">SHA512</a>] 
 					  </li>
 				  </ul>
-				  Storm artifacts are hosted in <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">Maven Central</a>. You can add Storm as a dependency with the following coordinates:
+				  Apache Storm artifacts are hosted in <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">Maven Central</a>. You can add Apache Storm as a dependency with the following coordinates:
 
 				  <pre>
 groupId: <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.storm%22">org.apache.storm</a>
diff --git a/index.html b/index.html
index cecdbf7..08c1c01 100644
--- a/index.html
+++ b/index.html
@@ -35,10 +35,10 @@
         <div class="row">
           <div class="col-md-8">
               <div class="box-primary">
-                    <h4>Why use Storm?</h4>
-                  <p>Apache Storm is a free and open source distributed realtime computation system. Storm makes it easy to reliably process unbounded streams of data, doing for realtime processing what Hadoop did for batch processing. Storm is simple, can be used with any programming language, and is a lot of fun to use!</p>
-                    <p>Storm has many use cases: realtime analytics, online machine learning, continuous computation, distributed RPC, ETL, and more. Storm is fast: a benchmark clocked it at over <strong>a million tuples processed per second per node</strong>. It is scalable, fault-tolerant, guarantees your data will be processed, and is easy to set up and operate.</p>
-                    <p>Storm integrates with the queueing and database technologies you already use. A Storm topology consumes streams of data and processes those streams in arbitrarily complex ways, repartitioning the streams between each stage of the computation however needed. Read more in the tutorial.</p>
+                    <h4>Why use Apache Storm?</h4>
+                  <p>Apache Storm is a free and open source distributed realtime computation system. Apache Storm makes it easy to reliably process unbounded streams of data, doing for realtime processing what Hadoop did for batch processing. Apache Storm is simple, can be used with any programming language, and is a lot of fun to use!</p>
+                    <p>Apache Storm has many use cases: realtime analytics, online machine learning, continuous computation, distributed RPC, ETL, and more. Apache Storm is fast: a benchmark clocked it at over <strong>a million tuples processed per second per node</strong>. It is scalable, fault-tolerant, guarantees your data will be processed, and is easy to set up and operate.</p>
+                    <p>Apache Storm integrates with the queueing and database technologies you already use. An Apache Storm topology consumes streams of data and processes those streams in arbitrarily complex ways, repartitioning the streams between each stage of the computation however needed. Read more in the tutorial.</p>
                 </div>
             </div>
             <div class="col-md-4">