http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/reference/topics/client-cache.html.md.erb
----------------------------------------------------------------------
diff --git a/reference/topics/client-cache.html.md.erb 
b/reference/topics/client-cache.html.md.erb
index 3ae87e0..8c42c16 100644
--- a/reference/topics/client-cache.html.md.erb
+++ b/reference/topics/client-cache.html.md.erb
@@ -7,7 +7,7 @@ This section documents all `cache.xml` elements that you use to 
configure Geode
 
 For Geode server configuration, see [<cache> Element 
Reference](cache_xml.html).
 
-API: `com.gemstone.gemfire.cache.client.ClientCacheFactory` and `PoolFactory` 
interfaces.
+API: `org.apache.geode.cache.client.ClientCacheFactory` and `PoolFactory` 
interfaces.
 
 <a id="cc-client-cache__table_B079C5A320194B3A98AD82DDB67DA43D"></a>
 
@@ -103,7 +103,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 Use for client caches. Defines a client's server pool used to communicate with 
servers running in a different distributed system.
 
-**API:** `com.gemstone.gemfire.cache.client.PoolFactory`
+**API:** `org.apache.geode.cache.client.PoolFactory`
 
 <a id="cc-pool__d93e1237"></a>
 
@@ -267,7 +267,7 @@ Addresses and ports of the locators to connect to. You can 
define multiple locat
 **Note:**
 Provide a locator list or `server` list, but not both.
 
-**API:** `com.gemstone.gemfire.distributed.LocatorLauncher`
+**API:** `org.apache.geode.distributed.LocatorLauncher`
 
 <a id="cc-locator__d93e1621"></a>
 
@@ -296,7 +296,7 @@ Provide a server list or `locator` list, but not both.
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.distributed.ServerLauncher`
+**API:** `org.apache.geode.distributed.ServerLauncher`
 
 <a id="cc-server__d93e1724"></a>
 
@@ -323,7 +323,7 @@ Defines a pool of one or more disk stores, which can be 
used by regions, and cli
 
 **Default:** The cache default disk store, named "DEFAULT", is used when disk 
is used but no disk store is named.
 
-**API:** `com.gemstone.gemfire.cache.DiskStore`
+**API:** `org.apache.geode.cache.DiskStore`
 
 <a id="cc-disk-store__d93e1818"></a>
 
@@ -461,7 +461,7 @@ Specifies a region or disk store's disk directory.
 
 Specifies the configuration for the Portable Data eXchange (PDX) method of 
serialization.
 
-**API:** `com.gemstone.gemfire.cache.CacheFactory.setPdxReadSerialized`, 
`setPdxDiskStore`, `setPdxPersistent`, `setPdxIgnoreUnreadFields` and 
`com.gemstone.gemfire.cache.ClientCacheFactory.setPdxReadSerialized`, 
`setPdxDiskStore`, `setPdxPersistent`, `setPdxIgnoreUnreadFields`
+**API:** `org.apache.geode.cache.CacheFactory.setPdxReadSerialized`, 
`setPdxDiskStore`, `setPdxPersistent`, `setPdxIgnoreUnreadFields` and 
`org.apache.geode.cache.ClientCacheFactory.setPdxReadSerialized`, 
`setPdxDiskStore`, `setPdxPersistent`, `setPdxIgnoreUnreadFields`
 
 <a id="cc-pdx__d93e2117"></a>
 
@@ -481,7 +481,7 @@ Specifies the configuration for the Portable Data eXchange 
(PDX) method of seria
   <pdx persistent="true" disk-store-name="myDiskStore">
     <pdx-serializer>
       <class-name>
-       com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer
+       org.apache.geode.pdx.ReflectionBasedAutoSerializer
       </class-name>
     <parameter name="classes">
       <string>com.company.domain.DomainObject</string>>
@@ -500,7 +500,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.CacheFactory.setPdxSerializer`
+**API:** `org.apache.geode.cache.CacheFactory.setPdxSerializer`
 
 **Example:**
 
@@ -519,7 +519,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 Specifies a region attributes template that can be named (by `id`) and 
referenced (by `refid`) later in the `cache.xml` and through the API.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory` or 
`com.gemstone.gemfire.cache.ClientRegionFactory`
+**API:** `org.apache.geode.cache.RegionFactory` or 
`org.apache.geode.cache.ClientRegionFactory`
 
 <a id="cc-region-attributes__d93e2287"></a>
 
@@ -857,7 +857,7 @@ Used only with GemFire version 6.x gateway configurations. 
For GemFire 7.0 confi
 </tr>
 <tr class="even">
 <td>statistics-enabled</td>
-<td>Boolean specifying whether to gather statistics on the region. Must be 
true to use expiration on the region. Geode provides a standard set of 
statistics for cached regions and region entries, which give you information 
for fine-tuning your distributed system. Unlike other Geode statistics, 
statistics for local and distributed regions are not archived and cannot be 
charted. They are kept in instances of <code class="ph 
codeph">com.gemstone.gemfire.cache.CacheStatistics</code> and made available 
through the region and its entries through the <code class="ph 
codeph">Region.getStatistics</code> and <code class="ph 
codeph">Region.Entry.getStatistics</code> methods.
+<td>Boolean specifying whether to gather statistics on the region. Must be 
true to use expiration on the region. Geode provides a standard set of 
statistics for cached regions and region entries, which give you information 
for fine-tuning your distributed system. Unlike other Geode statistics, 
statistics for local and distributed regions are not archived and cannot be 
charted. They are kept in instances of <code class="ph 
codeph">org.apache.geode.cache.CacheStatistics</code> and made available 
through the region and its entries through the <code class="ph 
codeph">Region.getStatistics</code> and <code class="ph 
codeph">Region.Entry.getStatistics</code> methods.
 <p><strong>API:</strong> <code class="ph 
codeph">setStatisticsEnabled</code></p>
 <p><strong>Example:</strong></p>
 <pre class="pre codeblock language-xml"><code>&lt;region-attributes 
@@ -913,7 +913,7 @@ Set the constraint in every cache where you create or 
update the region entries.
 
 **Default:** not set
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setKeyConstraint`
+**API:** `org.apache.geode.cache.RegionFactory.setKeyConstraint`
 
 **Example:**
 
@@ -934,7 +934,7 @@ Set the constraint in every cache where you create or 
update the region entries.
 
 **Default:** not set
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setValueConstraint`
+**API:** `org.apache.geode.cache.RegionFactory.setValueConstraint`
 
 **Example:**
 
@@ -952,7 +952,7 @@ Expiration setting that specifies how long the region can 
remain in the cache wi
 
 **Default:** not set - no expiration of this type
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setRegionTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setRegionTimeToLive`
 
 **Example:**
 
@@ -1043,11 +1043,11 @@ Select one of the following expiration actions:
 
 ## <a id="cc-custom-expiry" class="no-quick-link"></a>&lt;custom-expiry&gt;
 
-Specifies the custom class that implements 
`com.gemstone.gemfire.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
+Specifies the custom class that implements 
`org.apache.geode.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
 
 **Example:**
 
@@ -1075,7 +1075,7 @@ To ensure reliable read behavior across the partitioned 
region, use `region-time
 
 **Default:** not set - no expiration of this type
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setRegionIdleTimeout`
+**API:** `org.apache.geode.cache.RegionFactory.setRegionIdleTimeout`
 
 **Example:**
 
@@ -1165,11 +1165,11 @@ Select one of the following expiration actions:
 
 ## <a id="cc-rit-custom-expiry" class="no-quick-link"></a>&lt;custom-expiry&gt;
 
-Specifies the custom class that implements 
`com.gemstone.gemfire.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
+Specifies the custom class that implements 
`org.apache.geode.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
 
 **Example:**
 
@@ -1194,7 +1194,7 @@ Expiration setting that specifies how long the region’s 
entries can remain in
 
 **Default:** not set - no expiration of this type.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setEntryTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setEntryTimeToLive`
 
 **Example:**
 
@@ -1285,11 +1285,11 @@ Select one of the following expiration actions:
 
 ## <a id="cc-ettl-custom-expiry" 
class="no-quick-link"></a>&lt;custom-expiry&gt;
 
-Specifies the custom class that implements 
`com.gemstone.gemfire.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
+Specifies the custom class that implements 
`org.apache.geode.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
 
 **Example:**
 
@@ -1315,7 +1315,7 @@ Expiration setting that specifies how long the region’s 
entries can remain in
 **Note:**
 To ensure reliable read behavior across the partitioned region, use 
`entry-time-to-live` for entry expiration instead of this setting.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setEntryIdleTimeout`
+**API:** `org.apache.geode.cache.RegionFactory.setEntryIdleTimeout`
 
 **Example:**
 
@@ -1407,11 +1407,11 @@ Select one of the following expiration actions:
 
 ## <a id="cc-eit-custom-expiry" class="no-quick-link"></a>&lt;custom-expiry&gt;
 
-Specifies the custom class that implements 
`com.gemstone.gemfire.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
+Specifies the custom class that implements 
`org.apache.geode.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
 
 **Example:**
 
@@ -1436,7 +1436,7 @@ An event-handler plug-in that allows you to program for 
cache misses. At most, o
 
 For partitioned regions, if you want to have a cache loader, install an 
instance of the cache loader in every data store. Partitioned regions support 
partitioned loading, where each cache loader loads only the data entries in the 
local member. If data redundancy is configured, data is loaded only if the 
local member holds the primary copy.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCacheLoader`
+**API:** `org.apache.geode.cache.RegionFactory.setCacheLoader`
 
 **Example:**
 
@@ -1452,7 +1452,7 @@ For partitioned regions, if you want to have a cache 
loader, install an instance
 
 An event-handler plug-in that allows you to receive before-event notification 
for changes to the region and its entries. It also has the ability to abort 
events. At most, one cache writer can be defined in each member for the region. 
A cache writer may be invoked remotely from other members that have the region 
defined.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCacheWriter`
+**API:** `org.apache.geode.cache.RegionFactory.setCacheWriter`
 
 **Example:**
 
@@ -1470,7 +1470,7 @@ An event-handler plug-in that receives after-event 
notification of changes to th
 
 Specify the Java class for the cache listener and its initialization 
parameters with the `<class-name>` and `<parameter>` sub-elements. See 
[&lt;class-name&gt; and &lt;parameter&gt;](cache_xml.html#class-name_parameter).
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.addCacheListener`
+**API:** `org.apache.geode.cache.RegionFactory.addCacheListener`
 
 **Example:**
 
@@ -1490,7 +1490,7 @@ Specifies whether and how to control a region’s size. 
Size is controlled by re
 
 **Default:** Uses the lru-entry-count algorithm.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setEvictionAttributes`
+**API:** `org.apache.geode.cache.RegionFactory.setEvictionAttributes`
 
 **Example:**
 
@@ -1879,7 +1879,7 @@ Defines a region in the cache. See 
[&lt;region-attributes&gt;](cache_xml.html#re
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory` or 
`com.gemstone.gemfire.cache.ClientRegionFactory`
+**API:** `org.apache.geode.cache.RegionFactory` or 
`org.apache.geode.cache.ClientRegionFactory`
 
 <a id="cc-region__d93e5829"></a>
 
@@ -1918,7 +1918,7 @@ 
See[&lt;region-attributes&gt;](cache_xml.html#region-attributes) for a complete
 
 Specifies a region attributes template that can be named (by `id`) and 
referenced (by `refid`) later in the `cache.xml` and through the API.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory` or 
`com.gemstone.gemfire.cache.ClientRegionFactory`
+**API:** `org.apache.geode.cache.RegionFactory` or 
`org.apache.geode.cache.ClientRegionFactory`
 
 <a id="cc-r-region-attributes__d93e2287"></a>
 
@@ -2256,7 +2256,7 @@ Used only with GemFire version 6.x gateway 
configurations. For GemFire 7.0 confi
 </tr>
 <tr class="even">
 <td>statistics-enabled</td>
-<td>Boolean specifying whether to gather statistics on the region. Must be 
true to use expiration on the region. Geode provides a standard set of 
statistics for cached regions and region entries, which give you information 
for fine-tuning your distributed system. Unlike other Geode statistics, 
statistics for local and distributed regions are not archived and cannot be 
charted. They are kept in instances of <code class="ph 
codeph">com.gemstone.gemfire.cache.CacheStatistics</code> and made available 
through the region and its entries through the <code class="ph 
codeph">Region.getStatistics</code> and <code class="ph 
codeph">Region.Entry.getStatistics</code> methods.
+<td>Boolean specifying whether to gather statistics on the region. Must be 
true to use expiration on the region. Geode provides a standard set of 
statistics for cached regions and region entries, which give you information 
for fine-tuning your distributed system. Unlike other Geode statistics, 
statistics for local and distributed regions are not archived and cannot be 
charted. They are kept in instances of <code class="ph 
codeph">org.apache.geode.cache.CacheStatistics</code> and made available 
through the region and its entries through the <code class="ph 
codeph">Region.getStatistics</code> and <code class="ph 
codeph">Region.Entry.getStatistics</code> methods.
 <p><strong>API:</strong> <code class="ph 
codeph">setStatisticsEnabled</code></p>
 <p><strong>Example:</strong></p>
 <pre class="pre codeblock language-xml"><code>&lt;region-attributes 
@@ -2309,7 +2309,7 @@ Describes an index to be created on a region. The index 
node, if any, should all
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.query.QueryService.createIndex, 
createKeyIndex,                     createHashIndex`
+**API:** `org.apache.geode.cache.query.QueryService.createIndex, 
createKeyIndex,                     createHashIndex`
 
 <a id="cc-index__d93e5943"></a>
 
@@ -2352,7 +2352,7 @@ An "entry" element describes an entry to be added to a 
region. Note that if an e
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.Region.create`, `put`, `get`, `putAll`, 
`getAll`
+**API:** `org.apache.geode.cache.Region.create`, `put`, `get`, `putAll`, 
`getAll`
 
 **Example:**
 
@@ -2403,7 +2403,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 ``` pre
 <parameter name="cacheserver">
   <declarable>
-    
<class-name>com.gemstone.gemfire.addon.cache.CacheServerInitializer</class-name>
+    
<class-name>org.apache.geode.addon.cache.CacheServerInitializer</class-name>
     <parameter name="system.property.prefix">
     <string>cacheserver</string>
     </parameter>
@@ -2446,7 +2446,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 ``` pre
 <parameter name="cacheserver">
   <declarable>
-    
<class-name>com.gemstone.gemfire.addon.cache.CacheServerInitializer</class-name>
+    
<class-name>org.apache.geode.addon.cache.CacheServerInitializer</class-name>
     <parameter name="system.property.prefix">
     <string>cacheserver</string>
     </parameter>
@@ -2460,7 +2460,7 @@ Defines a region in the cache. See 
[&lt;region-attributes&gt;](cache_xml.html#re
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory` or 
`com.gemstone.gemfire.cache.ClientRegionFactory`
+**API:** `org.apache.geode.cache.RegionFactory` or 
`org.apache.geode.cache.ClientRegionFactory`
 
 <a id="cc-ra-region__d93e5829"></a>
 
@@ -2520,7 +2520,7 @@ Specify the Java class for the function and its 
initialization parameters with t
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.execute.FunctionService`
+**API:** `org.apache.geode.cache.execute.FunctionService`
 
 **Example:**
 
@@ -2536,7 +2536,7 @@ Specify the Java class for the function and its 
initialization parameters with t
 
 A memory monitor that tracks cache size as a percentage of total heap or 
off-heap memory and controls size by restricting access to the cache and 
prompting eviction of old entries from the cache. For tenured heap, used in 
conjunction with settings for JVM memory and Java garbage collection. For 
off-heap memory, used with the off-heap memory manager.
 
-**API:** `com.gemstone.gemfire.cache.control.ResourceManager`
+**API:** `org.apache.geode.cache.control.ResourceManager`
 
 <a id="cc-resource-manager__d93e6336"></a>
 
@@ -2622,7 +2622,7 @@ Allows you to configure the DataSerializer for this Geode 
member. It registers a
 
 Specify the Java class for the `DataSerializer` and its initialization 
parameters with the `<class-name>` sub-element.
 
-**API:** You can also register a `DataSerializer` by using the 
`com.gemstone.gemfire.DataSerializer.register` API. Use the 
`com.gemstone.gemfire.Instantiator` API to register a `DataSerializable` 
implementation.
+**API:** You can also register a `DataSerializer` by using the 
`org.apache.geode.DataSerializer.register` API. Use the 
`org.apache.geode.Instantiator` API to register a `DataSerializable` 
implementation.
 
 ## <a id="cc-instantiator" class="no-quick-link"></a>&lt;instantiator&gt;
 
@@ -2632,7 +2632,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 **API:** `DataSerializable`
 
-You can also directly specify `<instantiator>` as a sub-element of `<cache>`. 
Use the `com.gemstone.gemfire.Instantiator` API to register a 
`DataSerializable` implementation as the serialization framework for the cache. 
The following table lists the attribute that can be specified for an 
`<instantiator>`.
+You can also directly specify `<instantiator>` as a sub-element of `<cache>`. 
Use the `org.apache.geode.Instantiator` API to register a `DataSerializable` 
implementation as the serialization framework for the cache. The following 
table lists the attribute that can be specified for an `<instantiator>`.
 
 <a id="cc-instantiator__d93e6596"></a>
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/reference/topics/elements_ref.html.md.erb
----------------------------------------------------------------------
diff --git a/reference/topics/elements_ref.html.md.erb 
b/reference/topics/elements_ref.html.md.erb
index 3b5620a..9b13fab 100644
--- a/reference/topics/elements_ref.html.md.erb
+++ b/reference/topics/elements_ref.html.md.erb
@@ -40,7 +40,7 @@ The cache.xml file has these requirements:
         </client-cache>
         ```
 
--   Any class name specified in the file **must have a public zero-argument 
constructor** and must implement the `com.gemstone.gemfire.cache.Declarable` 
interface. Parameters declared in the XML for the class are passed to the class 
init method.
+-   Any class name specified in the file **must have a public zero-argument 
constructor** and must implement the `org.apache.geode.cache.Declarable` 
interface. Parameters declared in the XML for the class are passed to the class 
init method.
 
 ## <a 
id="topic_7B1CABCAD056499AA57AF3CFDBF8ABE3__section_5DBA12F9FC08406AAD5557E13A3DEDF2"
 class="no-quick-link"></a>Variables in cache.xml
 
@@ -79,7 +79,7 @@ To configure cache servers, clients, and WAN topologies, see 
the following secti
     -   [&lt;region&gt;](cache_xml.html#region)
     -   [&lt;region-attributes&gt;](cache_xml.html#region-attributes)
 
-    You can set the same server configuration properties using the <span 
class="keyword apiname">`com.gemstone.gemfire.cache.server.CacheServer`</span> 
and <span class="keyword apiname">`com.gemstone.gemfire.cache.Cache`</span> 
interfaces. For detailed information, see the online Java API documentation.
+    You can set the same server configuration properties using the <span 
class="keyword apiname">`org.apache.geode.cache.server.CacheServer`</span> and 
<span class="keyword apiname">`org.apache.geode.cache.Cache`</span> interfaces. 
For detailed information, see the online Java API documentation.
 
 -   Client Configuration
 
@@ -87,7 +87,7 @@ To configure cache servers, clients, and WAN topologies, see 
the following secti
     -   [&lt;pool&gt;](client-cache.html#cc-pool)
     -   [&lt;region&gt;](client-cache.html#cc-region)
 
-    You can set the same client configuration properties using the <span 
class="keyword apiname">`com.gemstone.gemfire.cache.clientClientCache`</span> 
and <span class="keyword apiname">`Pool`</span> interfaces. For detailed 
information, see the online Java API documentation.
+    You can set the same client configuration properties using the <span 
class="keyword apiname">`org.apache.geode.cache.clientClientCache`</span> and 
<span class="keyword apiname">`Pool`</span> interfaces. For detailed 
information, see the online Java API documentation.
 
 -   Multi-site (WAN) Configuration and Asynchronous Event Queue Configuration
 
@@ -95,6 +95,6 @@ To configure cache servers, clients, and WAN topologies, see 
the following secti
     -   
[&lt;gateway-receiver&gt;](../../reference/topics/gfe_cache_xml.html#gateway-receiver)
     -   
[&lt;async-event-queue&gt;](../../reference/topics/gfe_cache_xml.html#id_zrr_scq_rr)
 
-    The gateway sender and receiver APIs in <span class="keyword 
apiname">`com.gemstone.gemfire.cache.util`</span> provide corresponding getter 
and setter methods for these attributes.
+    The gateway sender and receiver APIs in <span class="keyword 
apiname">`org.apache.geode.cache.util`</span> provide corresponding getter and 
setter methods for these attributes.
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/reference/topics/gfe_cache_xml.html.md.erb
----------------------------------------------------------------------
diff --git a/reference/topics/gfe_cache_xml.html.md.erb 
b/reference/topics/gfe_cache_xml.html.md.erb
index 2f37ea2..fbe289d 100644
--- a/reference/topics/gfe_cache_xml.html.md.erb
+++ b/reference/topics/gfe_cache_xml.html.md.erb
@@ -6,7 +6,7 @@ This section documents the `cache.xml` sub-elements used for 
Geode server config
 
 For Geode client configuration, see [&lt;client-cache&gt; Element 
Reference](client-cache.html#cc-client-cache).
 
-**API**:`com.gemstone.gemfire.cache.CacheFactory`
+**API**:`org.apache.geode.cache.CacheFactory`
 
 <a id="id_zn4_qbq_rr__d2116e40"></a>
 
@@ -124,7 +124,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 ## <a id="id_sqg_3cq_rr" 
class="no-quick-link"></a>&lt;dynamic-region-factory&gt;
 
-The `<dynamic-region-factory>` element configures a dynamic region factory for 
this cache. You can use this element to dynamically create regions in your 
application code. Use the <span class="keyword 
apiname">createDynamicRegion()</span> method of the <span class="keyword 
apiname">com.gemstone.gemfire.cache.DynamicRegionFactory</span> class in your 
Java code to dynamically create regions.
+The `<dynamic-region-factory>` element configures a dynamic region factory for 
this cache. You can use this element to dynamically create regions in your 
application code. Use the <span class="keyword 
apiname">createDynamicRegion()</span> method of the <span class="keyword 
apiname">org.apache.geode.cache.DynamicRegionFactory</span> class in your Java 
code to dynamically create regions.
 
 **Note:**
 You can not use this element to dynamically create *partitioned* regions.
@@ -135,7 +135,7 @@ The optional `<disk-dir>` sub-element specifies the 
directory to store the persi
 
 Set the `pool-name` attribute to set the name of the connection pool used by 
client applications in a client/server cache configuration. Do not specify the 
`pool-name` attribute in servers or peers.
 
-**API:** `com.gemstone.gemfire.cache.DynamicRegionFactory`
+**API:** `org.apache.geode.cache.DynamicRegionFactory`
 
 <a id="id_sqg_3cq_rr__d2116e313"></a>
 
@@ -342,14 +342,14 @@ When distributing region events from the local queue, 
multiple dispatcher thread
     parallel="true" 
     remote-distributed-system-id="1"> 
     <gateway-event-filter>
-      <class-name>com.gemstone.gemfire.util.SampleEventFilter</class-name>
+      <class-name>org.apache.geode.util.SampleEventFilter</class-name>
       <parameter 
        name="param1">
         <string>"value1"</string>
       </parameter>
     </gateway-event-filter>
     <gateway-transport-filter>
-      <class-name>com.gemstone.gemfire.util.SampleTransportFilter</class-name>
+      <class-name>org.apache.geode.util.SampleTransportFilter</class-name>
       <parameter 
        name="param1">
         <string>"value1"</string>
@@ -370,7 +370,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 ``` pre
 <gateway-event-filter>
-      <class-name>com.gemstone.gemfire.util.SampleEventFilter</class-name>
+      <class-name>org.apache.geode.util.SampleEventFilter</class-name>
       <parameter name="param1">
         <string>"value1"</string>
       </parameter>
@@ -387,7 +387,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 ``` pre
 <gateway-event-substitution-filter>
-      
<class-name>com.gemstone.gemfire.util.SampleEventSubstitutionFilter</class-name>
+      
<class-name>org.apache.geode.util.SampleEventSubstitutionFilter</class-name>
       <parameter name="param1">
         <string>"value1"</string>
       </parameter>
@@ -404,7 +404,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 ``` pre
 <gateway-transport-filter>
-      <class-name>com.gemstone.gemfire.util.SampleTransportFilter</class-name>
+      <class-name>org.apache.geode.util.SampleTransportFilter</class-name>
       <parameter 
        name="param1">
         <string>"value1"</string>
@@ -483,7 +483,7 @@ Configures a gateway receiver to receive and apply region 
events that were distr
 <cache>
      <gateway-receiver start-port="1530" end-port="1551"> 
     <gateway-transport-filter>>
-      <class-name>com.gemstone.gemfire.util.SampleTransportFilter</class-name>
+      <class-name>org.apache.geode.util.SampleTransportFilter</class-name>
       <parameter 
        name="param1">
         <string>"value1"</string>
@@ -503,7 +503,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 ``` pre
 <gateway-transport-filter>
-      <class-name>com.gemstone.gemfire.util.SampleTransportFilter</class-name>
+      <class-name>org.apache.geode.util.SampleTransportFilter</class-name>
       <parameter 
        name="param1">
         <string>"value1"</string>
@@ -517,7 +517,7 @@ An event-handler plug-in that is called in order to 
determine whether a potentia
 
 Specify the Java class for the gateway conflict resolver plug-in and its 
initialization parameters with the `<class-name>` and `<parameter>` 
sub-elements. See [&lt;class-name&gt; and 
&lt;parameter&gt;](#class-name_parameter).
 
-**API:** `com.gemstone.gemfire.cache.util.GatewayConflictResolver`
+**API:** `org.apache.geode.cache.util.GatewayConflictResolver`
 
 **Example:**
 
@@ -533,7 +533,7 @@ Specify the Java class for the gateway conflict resolver 
plug-in and its initial
 
 Configures a queue for sending region events to an AsyncEventListener 
implementation (for example, for write-behind event handling).
 
-**API:** `com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue`
+**API:** `org.apache.geode.cache.asyncqueue.AsyncEventQueue`
 
 <a id="id_zrr_scq_rr__d2116e424"></a>
 
@@ -654,7 +654,7 @@ An AsyncEventListener receives callbacks for events that 
change region data. You
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements. See [&lt;class-name&gt; and 
&lt;parameter&gt;](cache_xml.html#class-name_parameter).
 
-**API:** `com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener`
+**API:** `org.apache.geode.cache.asyncqueue.AsyncEventListener`
 
 **Example:**
 
@@ -679,9 +679,9 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 Configures the cache to serve region data to clients in a client/server 
caching system. This element indicates the port the server listens on for 
client communication.
 
-The `cacheserver` process uses only `cache.xml` configuration. For application 
servers, you can set the same configuration properties using the 
`com.gemstone.gemfire.cache.server.CacheServer` and 
`com.gemstone.gemfire.cache.Cache` interfaces. For detailed information, see 
the online Java API documentation.
+The `cacheserver` process uses only `cache.xml` configuration. For application 
servers, you can set the same configuration properties using the 
`org.apache.geode.cache.server.CacheServer` and `org.apache.geode.cache.Cache` 
interfaces. For detailed information, see the online Java API documentation.
 
-**API:** `com.gemstone.gemfire.cache.server.CacheServer`
+**API:** `org.apache.geode.cache.server.CacheServer`
 
 <a id="id_j5l_xcq_rr__d2116e795"></a>
 
@@ -832,7 +832,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 **Default:** If this is not defined, the default Geode load probe is used.
 
-**API:** `com.gemstone.gemfire.cache.server.setLoadProbe`
+**API:** `org.apache.geode.cache.server.setLoadProbe`
 
 **Example:**
 
@@ -848,7 +848,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 Use for client caches. Defines a client's server pool used to communicate with 
servers running in a different distributed system.
 
-**API:** `com.gemstone.gemfire.cache.client.PoolFactory`
+**API:** `org.apache.geode.cache.client.PoolFactory`
 
 <a id="id_jbr_kdq_rr__d2116e1237"></a>
 
@@ -1012,7 +1012,7 @@ Addresses and ports of the locators to connect to. You 
can define multiple locat
 **Note:**
 Provide a locator list or `server` list, but not both.
 
-**API:** `com.gemstone.gemfire.distributed.LocatorLauncher`
+**API:** `org.apache.geode.distributed.LocatorLauncher`
 
 <a id="id_fsd_ldq_rr__d2116e1621"></a>
 
@@ -1041,7 +1041,7 @@ Provide a server list or `locator` list, but not both.
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.distributed.ServerLauncher`
+**API:** `org.apache.geode.distributed.ServerLauncher`
 
 <a id="id_ds3_ndq_rr__d2116e1724"></a>
 
@@ -1068,7 +1068,7 @@ Defines a pool of one or more disk stores, which can be 
used by regions, and cli
 
 **Default:** The cache default disk store, named "DEFAULT", is used when disk 
is used but no disk store is named.
 
-**API:** `com.gemstone.gemfire.cache.DiskStore`
+**API:** `org.apache.geode.cache.DiskStore`
 
 <a id="id_q21_5dq_rr__d2116e1818"></a>
 
@@ -1206,7 +1206,7 @@ Specifies a region or disk store's disk directory.
 
 Specifies the configuration for the Portable Data eXchange (PDX) method of 
serialization.
 
-**API:** `com.gemstone.gemfire.cache.CacheFactory.setPdxReadSerialized`, 
`setPdxDiskStore`, `setPdxPersistent`, `setPdxIgnoreUnreadFields` and 
`com.gemstone.gemfire.cache.ClientCacheFactory.setPdxReadSerialized`, 
`setPdxDiskStore`, `setPdxPersistent`, `setPdxIgnoreUnreadFields`
+**API:** `org.apache.geode.cache.CacheFactory.setPdxReadSerialized`, 
`setPdxDiskStore`, `setPdxPersistent`, `setPdxIgnoreUnreadFields` and 
`org.apache.geode.cache.ClientCacheFactory.setPdxReadSerialized`, 
`setPdxDiskStore`, `setPdxPersistent`, `setPdxIgnoreUnreadFields`
 
 <a id="id_vvt_vdq_rr__d2116e2117"></a>
 
@@ -1226,7 +1226,7 @@ Specifies the configuration for the Portable Data 
eXchange (PDX) method of seria
   <pdx persistent="true" disk-store-name="myDiskStore">
     <pdx-serializer>
       <class-name>
-       com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer
+       org.apache.geode.pdx.ReflectionBasedAutoSerializer
       </class-name>
     <parameter name="classes">
       <string>com.company.domain.DomainObject</string>>
@@ -1245,7 +1245,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.CacheFactory.setPdxSerializer`
+**API:** `org.apache.geode.cache.CacheFactory.setPdxSerializer`
 
 **Example:**
 
@@ -1264,7 +1264,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 Specifies a region attributes template that can be named (by `id`) and 
referenced (by `refid`) later in the `cache.xml` and through the API.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory` or 
`com.gemstone.gemfire.cache.ClientRegionFactory`
+**API:** `org.apache.geode.cache.RegionFactory` or 
`org.apache.geode.cache.ClientRegionFactory`
 
 <a id="id_p1s_ydq_rr__d2116e2287"></a>
 
@@ -1602,7 +1602,7 @@ Used only with GemFire version 6.x gateway 
configurations. For GemFire 7.0 confi
 </tr>
 <tr class="even">
 <td>statistics-enabled</td>
-<td>Boolean specifying whether to gather statistics on the region. Must be 
true to use expiration on the region. Geode provides a standard set of 
statistics for cached regions and region entries, which give you information 
for fine-tuning your distributed system. Unlike other Geode statistics, 
statistics for local and distributed regions are not archived and cannot be 
charted. They are kept in instances of <code class="ph 
codeph">com.gemstone.gemfire.cache.CacheStatistics</code> and made available 
through the region and its entries through the <code class="ph 
codeph">Region.getStatistics</code> and <code class="ph 
codeph">Region.Entry.getStatistics</code> methods.
+<td>Boolean specifying whether to gather statistics on the region. Must be 
true to use expiration on the region. Geode provides a standard set of 
statistics for cached regions and region entries, which give you information 
for fine-tuning your distributed system. Unlike other Geode statistics, 
statistics for local and distributed regions are not archived and cannot be 
charted. They are kept in instances of <code class="ph 
codeph">org.apache.geode.cache.CacheStatistics</code> and made available 
through the region and its entries through the <code class="ph 
codeph">Region.getStatistics</code> and <code class="ph 
codeph">Region.Entry.getStatistics</code> methods.
 <p><strong>API:</strong> <code class="ph 
codeph">setStatisticsEnabled</code></p>
 <p><strong>Example:</strong></p>
 <pre class="pre codeblock language-xml"><code>&lt;region-attributes 
@@ -1658,7 +1658,7 @@ Set the constraint in every cache where you create or 
update the region entries.
 
 **Default:** not set
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setKeyConstraint`
+**API:** `org.apache.geode.cache.RegionFactory.setKeyConstraint`
 
 **Example:**
 
@@ -1679,7 +1679,7 @@ Set the constraint in every cache where you create or 
update the region entries.
 
 **Default:** not set
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setValueConstraint`
+**API:** `org.apache.geode.cache.RegionFactory.setValueConstraint`
 
 **Example:**
 
@@ -1697,7 +1697,7 @@ Expiration setting that specifies how long the region can 
remain in the cache wi
 
 **Default:** not set - no expiration of this type
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setRegionTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setRegionTimeToLive`
 
 **Example:**
 
@@ -1788,11 +1788,11 @@ Select one of the following expiration actions:
 
 ## <a id="id_l2x_c2q_rr" class="no-quick-link"></a>&lt;custom-expiry&gt;
 
-Specifies the custom class that implements 
`com.gemstone.gemfire.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
+Specifies the custom class that implements 
`org.apache.geode.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
 
 **Example:**
 
@@ -1820,7 +1820,7 @@ To ensure reliable read behavior across the partitioned 
region, use `region-time
 
 **Default:** not set - no expiration of this type
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setRegionIdleTimeout`
+**API:** `org.apache.geode.cache.RegionFactory.setRegionIdleTimeout`
 
 **Example:**
 
@@ -1910,11 +1910,11 @@ Select one of the following expiration actions:
 
 ## <a id="region-idle-time_custom-expiry" 
class="no-quick-link"></a>&lt;custom-expiry&gt;
 
-Specifies the custom class that implements 
`com.gemstone.gemfire.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
+Specifies the custom class that implements 
`org.apache.geode.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
 
 **Example:**
 
@@ -1939,7 +1939,7 @@ Expiration setting that specifies how long the region’s 
entries can remain in
 
 **Default:** not set - no expiration of this type.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setEntryTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setEntryTimeToLive`
 
 **Example:**
 
@@ -2030,11 +2030,11 @@ Select one of the following expiration actions:
 
 ## <a id="entry-time-to-live_custom_expiry" 
class="no-quick-link"></a>&lt;custom-expiry&gt;
 
-Specifies the custom class that implements 
`com.gemstone.gemfire.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
+Specifies the custom class that implements 
`org.apache.geode.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
 
 **Example:**
 
@@ -2060,7 +2060,7 @@ Expiration setting that specifies how long the region’s 
entries can remain in
 **Note:**
 To ensure reliable read behavior across the partitioned region, use 
`entry-time-to-live` for entry expiration instead of this setting.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setEntryIdleTimeout`
+**API:** `org.apache.geode.cache.RegionFactory.setEntryIdleTimeout`
 
 **Example:**
 
@@ -2152,11 +2152,11 @@ Select one of the following expiration actions:
 
 ## <a id="entry-idle-time_custom-expiry" 
class="no-quick-link"></a>&lt;custom-expiry&gt;
 
-Specifies the custom class that implements 
`com.gemstone.gemfire.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
+Specifies the custom class that implements 
`org.apache.geode.cache.CustomExpiry`. You define this class in order to 
override the region-wide settings for specific entries. See [Configure Data 
Expiration](../../developing/expiration/configuring_data_expiration.html) for 
an example.
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
+**API:** `org.apache.geode.cache.RegionFactory.setCustomEntryIdleTimeout`, 
`setCustomeEntryTimeToLive`
 
 **Example:**
 
@@ -2182,7 +2182,7 @@ Defines the region as partitioned and controls 
partitioning behavior. This is se
 **Note:**
 With the exception of `local-max-memory`, all members defining a partitioned 
region must use the same partition attribute settings.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setPartitionAttributes`
+**API:** `org.apache.geode.cache.RegionFactory.setPartitionAttributes`
 
 <a id="id_thp_h2q_rr__d2116e4014"></a>
 
@@ -2212,7 +2212,7 @@ With the exception of `local-max-memory`, all members 
defining a partitioned reg
 
 Describes a custom PartitionResolver for a region.
 
-**API:** 
`com.gemstone.gemfire.cache.PartitionAttributesFactory.setPartitionResolver`
+**API:** 
`org.apache.geode.cache.PartitionAttributesFactory.setPartitionResolver`
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements. See [&lt;class-name&gt; and 
&lt;parameter&gt;](cache_xml.html#class-name_parameter).
 
@@ -2245,7 +2245,7 @@ Defines a custom PartitionListener for a partitioned 
region.
 
 Specify the Java class and its initialization parameters with the 
`<class-name>` and `<parameter>` sub-elements. See [&lt;class-name&gt; and 
&lt;parameter&gt;](cache_xml.html#class-name_parameter).
 
-**API:** 
`com.gemstone.gemfire.cache.PartitionAttributesFactory.PartitionListener`
+**API:** `org.apache.geode.cache.PartitionAttributesFactory.PartitionListener`
 
 **Example:**
 
@@ -2264,7 +2264,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 Describes a partition in a Fixed Partitioned Region.
 
-**API:** 
`com.gemstone.gemfire.cache.PartitionAttributesFactory.addFixedPartitionAttributes`
+**API:** 
`org.apache.geode.cache.PartitionAttributesFactory.addFixedPartitionAttributes`
 
 <a id="id_vgx_32q_rr__d2116e4308"></a>
 
@@ -2302,7 +2302,7 @@ Describes a partition in a Fixed Partitioned Region.
 
 Establishes reliability requirements and behavior for a region. Use this to 
configure the region to require one or more membership roles to be running in 
the system for reliable access to the region. You can set up your own roles, 
such as producer or backup, specifying each role as a string. Membership 
attributes have no effect unless one or more required roles are specified.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setMembershipAttributes`
+**API:** `org.apache.geode.cache.RegionFactory.setMembershipAttributes`
 
 <a id="id_dsh_j2q_rr__d2116e4408"></a>
 
@@ -2392,7 +2392,7 @@ Specifies how the region is affected by resumption of 
reliability when one or mo
 
 Specifies a role that is required for reliable access to the region.
 
-**API:** `com.gemstone.gemfire.cache.MembershipAttributes`
+**API:** `org.apache.geode.cache.MembershipAttributes`
 
 <a id="id_kfw_j2q_rr__d2116e4568"></a>
 
@@ -2419,7 +2419,7 @@ Specifies subscriber requirements and behavior for the 
region. There is one subs
 **Note:**
 The interest policy determines which events are delivered, but the 
`data-policy` determines how the events are applied to the cache.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setSubscriptionAttributes`
+**API:** `org.apache.geode.cache.RegionFactory.setSubscriptionAttributes`
 
 <a id="id_a3g_k2q_rr__d2116e4657"></a>
 
@@ -2477,7 +2477,7 @@ An event-handler plug-in that allows you to program for 
cache misses. At most, o
 
 For partitioned regions, if you want to have a cache loader, install an 
instance of the cache loader in every data store. Partitioned regions support 
partitioned loading, where each cache loader loads only the data entries in the 
local member. If data redundancy is configured, data is loaded only if the 
local member holds the primary copy.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCacheLoader`
+**API:** `org.apache.geode.cache.RegionFactory.setCacheLoader`
 
 **Example:**
 
@@ -2493,7 +2493,7 @@ For partitioned regions, if you want to have a cache 
loader, install an instance
 
 An event-handler plug-in that allows you to receive before-event notification 
for changes to the region and its entries. It also has the ability to abort 
events. At most, one cache writer can be defined in each member for the region. 
A cache writer may be invoked remotely from other members that have the region 
defined.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setCacheWriter`
+**API:** `org.apache.geode.cache.RegionFactory.setCacheWriter`
 
 **Example:**
 
@@ -2511,7 +2511,7 @@ An event-handler plug-in that receives after-event 
notification of changes to th
 
 Specify the Java class for the cache listener and its initialization 
parameters with the `<class-name>` and `<parameter>` sub-elements. See 
[&lt;class-name&gt; and &lt;parameter&gt;](cache_xml.html#class-name_parameter).
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.addCacheListener`
+**API:** `org.apache.geode.cache.RegionFactory.addCacheListener`
 
 **Example:**
 
@@ -2548,7 +2548,7 @@ Specifies whether and how to control a region’s size. 
Size is controlled by re
 
 **Default:** Uses the lru-entry-count algorithm.
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory.setEvictionAttributes`
+**API:** `org.apache.geode.cache.RegionFactory.setEvictionAttributes`
 
 **Example:**
 
@@ -2937,7 +2937,7 @@ Defines a region in the cache. See 
[&lt;region-attributes&gt;](cache_xml.html#re
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.RegionFactory` or 
`com.gemstone.gemfire.cache.ClientRegionFactory`
+**API:** `org.apache.geode.cache.RegionFactory` or 
`org.apache.geode.cache.ClientRegionFactory`
 
 <a id="id_q5c_s2q_rr__d2116e5829"></a>
 
@@ -2978,7 +2978,7 @@ Describes an index to be created on a region. The index 
node, if any, should all
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.query.QueryService.createIndex, 
createKeyIndex,                     createHashIndex`
+**API:** `org.apache.geode.cache.query.QueryService.createIndex, 
createKeyIndex,                     createHashIndex`
 
 <a id="id_kcn_s2q_rr__d2116e5943"></a>
 
@@ -3021,7 +3021,7 @@ An "entry" element describes an entry to be added to a 
region. Note that if an e
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.Region.create`, `put`, `get`, `putAll`, 
`getAll`
+**API:** `org.apache.geode.cache.Region.create`, `put`, `get`, `putAll`, 
`getAll`
 
 **Example:**
 
@@ -3054,7 +3054,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 ``` pre
 <parameter name="cacheserver">
   <declarable>
-    
<class-name>com.gemstone.gemfire.addon.cache.CacheServerInitializer</class-name>
+    
<class-name>org.apache.geode.addon.cache.CacheServerInitializer</class-name>
     <parameter name="system.property.prefix">
     <string>cacheserver</string>
     </parameter>
@@ -3097,7 +3097,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 ``` pre
 <parameter name="cacheserver">
   <declarable>
-    
<class-name>com.gemstone.gemfire.addon.cache.CacheServerInitializer</class-name>
+    
<class-name>org.apache.geode.addon.cache.CacheServerInitializer</class-name>
     <parameter name="system.property.prefix">
     <string>cacheserver</string>
     </parameter>
@@ -3158,7 +3158,7 @@ Specify the Java class for the function and its 
initialization parameters with t
 
 **Default:**
 
-**API:** `com.gemstone.gemfire.cache.execute.FunctionService`
+**API:** `org.apache.geode.cache.execute.FunctionService`
 
 **Example:**
 
@@ -3174,7 +3174,7 @@ Specify the Java class for the function and its 
initialization parameters with t
 
 A memory monitor that tracks cache size as a percentage of total heap or 
off-heap memory and controls size by restricting access to the cache and 
prompting eviction of old entries from the cache. For tenured heap, used in 
conjunction with settings for JVM memory and Java garbage collection. For 
off-heap memory, used with the off-heap memory manager.
 
-**API:** `com.gemstone.gemfire.cache.control.ResourceManager`
+**API:** `org.apache.geode.cache.control.ResourceManager`
 
 <a id="id_yvl_x2q_rr__d2116e6336"></a>
 
@@ -3260,7 +3260,7 @@ Allows you to configure the DataSerializer for this Geode 
member. It registers a
 
 Specify the Java class for the `DataSerializer` and its initialization 
parameters with the `<class-name>` sub-element.
 
-**API:** You can also register a `DataSerializer` by using the 
`com.gemstone.gemfire.DataSerializer.register` API. Use the 
`com.gemstone.gemfire.Instantiator` API to register a `DataSerializable` 
implementation.
+**API:** You can also register a `DataSerializer` by using the 
`org.apache.geode.DataSerializer.register` API. Use the 
`org.apache.geode.Instantiator` API to register a `DataSerializable` 
implementation.
 
 ## <a id="id_p5t_y2q_rr" class="no-quick-link"></a>&lt;instantiator&gt;
 
@@ -3270,7 +3270,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 
 **API:** `DataSerializable`
 
-You can also directly specify `<instantiator>` as a sub-element of `<cache>`. 
Use the `com.gemstone.gemfire.Instantiator` API to register a 
`DataSerializable` implementation as the serialization framework for the cache. 
The following table lists the attribute that can be specified for an 
`<instantiator>`.
+You can also directly specify `<instantiator>` as a sub-element of `<cache>`. 
Use the `org.apache.geode.Instantiator` API to register a `DataSerializable` 
implementation as the serialization framework for the cache. The following 
table lists the attribute that can be specified for an `<instantiator>`.
 
 <a id="id_p5t_y2q_rr__d2116e6596"></a>
 
@@ -3325,7 +3325,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 ``` pre
 <parameter name="cacheserver">
   <declarable>
-    
<class-name>com.gemstone.gemfire.addon.cache.CacheServerInitializer</class-name>
+    
<class-name>org.apache.geode.addon.cache.CacheServerInitializer</class-name>
     <parameter name="system.property.prefix">
     <string>cacheserver</string>
     </parameter>
@@ -3365,7 +3365,7 @@ Specify the Java class and its initialization parameters 
with the `<class-name>`
 ``` pre
 <parameter name="cacheserver">
   <declarable>
-    
<class-name>com.gemstone.gemfire.addon.cache.CacheServerInitializer</class-name>
+    
<class-name>org.apache.geode.addon.cache.CacheServerInitializer</class-name>
     <parameter name="system.property.prefix">
     <string>cacheserver</string>
     </parameter>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/reference/topics/handling_exceptions_and_failures.html.md.erb
----------------------------------------------------------------------
diff --git a/reference/topics/handling_exceptions_and_failures.html.md.erb 
b/reference/topics/handling_exceptions_and_failures.html.md.erb
index 61f8284..0fd854c 100644
--- a/reference/topics/handling_exceptions_and_failures.html.md.erb
+++ b/reference/topics/handling_exceptions_and_failures.html.md.erb
@@ -6,7 +6,7 @@ Your application needs to catch certain classes to handle all 
the exceptions and
 
 -   `GemFireCheckedException`. This class is the abstract superclass of 
exceptions that are thrown and declared. Wherever possible, GemFire exceptions 
are checked exceptions. `GemFireCheckedException` is a Geode version of 
`java.lang.Exception`.
 -   `GemFireException`. This class is the abstract superclass of unchecked 
exceptions that are thrown to indicate conditions for which the developer 
should not normally need to check. You can look at the subclasses of 
`GemFireException` to see all the runtime exceptions in the GemFire system; see 
the class hierarchy in the online Java API documentation. `GemFireException` is 
a Geode version of java.lang.`RuntimeException`. You can also look at the 
method details in the `Region` API javadocs for Geode exceptions you may want 
to catch.
--   `SystemFailure`. In addition to exception management, Geode provides a 
class to help you manage catastrophic failure in your distributed system, 
particularly in your application. The Javadocs for this class provide extensive 
guidance for managing failures in your system and your application. See 
`SystemFailure` in the `com.gemstone.gemfire` package.
+-   `SystemFailure`. In addition to exception management, Geode provides a 
class to help you manage catastrophic failure in your distributed system, 
particularly in your application. The Javadocs for this class provide extensive 
guidance for managing failures in your system and your application. See 
`SystemFailure` in the `org.apache.geode` package.
 
 To see the exceptions thrown by a specific method, refer to the method's 
online Java documentation.
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/reference/topics/region_shortcuts_reference.html.md.erb
----------------------------------------------------------------------
diff --git a/reference/topics/region_shortcuts_reference.html.md.erb 
b/reference/topics/region_shortcuts_reference.html.md.erb
index c10da71..f3d9ca9 100644
--- a/reference/topics/region_shortcuts_reference.html.md.erb
+++ b/reference/topics/region_shortcuts_reference.html.md.erb
@@ -115,7 +115,7 @@ Eviction | eviction-algorithm | lru-heap-percentage
         <lru-heap-percentage 
            action="local-destroy">
           <class-name>
-           com.gemstone.gemfire.internal.size.SizeClassOnceObjectSizer
+           org.apache.geode.internal.size.SizeClassOnceObjectSizer
           </class-name>
         </lru-heap-percentage>
       </eviction-attributes>
@@ -423,7 +423,7 @@ Eviction | eviction-algorithm | lru-heap-percentage
       <eviction-attributes>
         <lru-heap-percentage 
             action="local-destroy">
-            
<class-name>com.gemstone.gemfire.internal.size.SizeClassOnceObjectSizer</class-name>
+            
<class-name>org.apache.geode.internal.size.SizeClassOnceObjectSizer</class-name>
         </lru-heap-percentage>
       </eviction-attributes>
   </region-attributes>
@@ -873,7 +873,7 @@ Partition | redundant-copies   | 1
         <eviction-attributes>
           <lru-heap-percentage action="local-destroy">
            <class-name>
-            com.gemstone.gemfire.internal.size.SizeClassOnceObjectSizer
+            org.apache.geode.internal.size.SizeClassOnceObjectSizer
            </class-name>
           </lru-heap-percentage>
       </eviction-attributes>
@@ -1227,7 +1227,7 @@ Eviction | eviction-algorithm | lru-heap-percentage
        <eviction-attributes>
          <lru-heap-percentage 
             action="local-destroy">
-            
<class-name>com.gemstone.gemfire.internal.size.SizeClassOnceObjectSizer</class-name>
+            
<class-name>org.apache.geode.internal.size.SizeClassOnceObjectSizer</class-name>
          </lru-heap-percentage>
        </eviction-attributes>
     </region-attributes>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/develop_rest_apps.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/develop_rest_apps.html.md.erb 
b/rest_apps/develop_rest_apps.html.md.erb
index a40bf1a..fff34d5 100644
--- a/rest_apps/develop_rest_apps.html.md.erb
+++ b/rest_apps/develop_rest_apps.html.md.erb
@@ -56,7 +56,7 @@ Date: Sat, 18 Jan 2014 20:05:47 GMT
             "name": "customers",
             "type": "REPLICATE",
             "key-constraint": "java.lang.String",
-            "value-constraint": "com.gemstone.gemfire.pdx.PdxInstance"
+            "value-constraint": "org.apache.geode.pdx.PdxInstance"
         },
         {
             "name": "items",
@@ -80,7 +80,7 @@ Date: Sat, 18 Jan 2014 20:05:47 GMT
             "name": "empty_region",
             "type": "EMPTY",
             "key-constraint": "java.lang.String",
-            "value-constraint": "com.gemstone.gemfire.pdx.PdxInstance"
+            "value-constraint": "org.apache.geode.pdx.PdxInstance"
         }
     ]
 }
@@ -216,7 +216,7 @@ POST /gemfire-api/v1/orders?key=2
 Accept: application/json
 Content-Type: application/json
 {
-    "@type":  "com.gemstone.gemfire.web.rest.domain.Order",
+    "@type":  "org.apache.geode.web.rest.domain.Order",
      "purchaseOrderNo": 112,
      "customerId": 1012,
      "description":  "Purchase Order for myCompany",
@@ -266,7 +266,7 @@ Request Payload: application/json
 Content-Type: application/json
 Accept: application/json
 {
-    "@type": "com.gemstone.gemfire.web.rest.domain.Order",
+    "@type": "org.apache.geode.web.rest.domain.Order",
      "purchaseOrderNo": 1121,
      "customerId": 1012,
      "description":  "Order for XYZ Corp",
@@ -325,7 +325,7 @@ Accept: application/json
 Content-Type: application/json
 {
     "@old": {
-         "@type":  "com.gemstone.gemfire.web.rest.domain.Order",
+         "@type":  "org.apache.geode.web.rest.domain.Order",
          "purchaseOrderNo": 1121,
          "customerId": 1012,
          "description":  "Order for  XYZ Corp",
@@ -346,7 +346,7 @@ Content-Type: application/json
          "totalPrice": 225
     },
      "@new ": {
-         "@type":  "com.gemstone.gemfire.web.rest.domain.Order",
+         "@type":  "org.apache.geode.web.rest.domain.Order",
          "purchaseOrderNo": 1121,
          "customerId": 1013,
          "description":  "Order for  New Corp",
@@ -508,7 +508,7 @@ Content-Type: application/json
                 "itemNo": 1,
                 "unitPrice": 20,
                 "totalPrice": 200,
-                "type-class": "com.gemstone.gemfire.web.rest.domain.Item"
+                "type-class": "org.apache.geode.web.rest.domain.Item"
             },
             {
                 "description": "Product-BBB",
@@ -516,11 +516,11 @@ Content-Type: application/json
                 "itemNo": 2,
                 "unitPrice": 10,
                 "totalPrice": 150,
-                "type-class": "com.gemstone.gemfire.web.rest.domain.Item"
+                "type-class": "org.apache.geode.web.rest.domain.Item"
             }
         ],
         "orderDate": "Mon Feb 10 00:00:00 IST 2014",
-        "type-class": "com.gemstone.gemfire.web.rest.domain.Order"
+        "type-class": "org.apache.geode.web.rest.domain.Order"
     },
     {...},
     {...}
@@ -557,7 +557,7 @@ Content-Type: application/json
         "firstName": "Jane",
         "lastName": "Doe",
         "customerId": 101,
-        "type-class": "com.gemstone.gemfire.web.rest.domain.Customer"
+        "type-class": "org.apache.geode.web.rest.domain.Customer"
     }
 ]
 ```
@@ -653,7 +653,7 @@ Content-Type: application/json
         "@value": 210
     },
     {
-        "@type": "com.gemstone.gemfire.web.rest.domain.Item",
+        "@type": "org.apache.geode.web.rest.domain.Item",
         "itemNo": "599",
         "description": "Part X Free on Bumper Offer",
         "quantity": "2",

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/get_region_data_for_multiple_keys.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/get_region_data_for_multiple_keys.html.md.erb 
b/rest_apps/get_region_data_for_multiple_keys.html.md.erb
index 2a0f3c1..a855dfa 100644
--- a/rest_apps/get_region_data_for_multiple_keys.html.md.erb
+++ b/rest_apps/get_region_data_for_multiple_keys.html.md.erb
@@ -65,7 +65,7 @@ Date: Sat, 18 Jan 2014 21:39:04 GMT
     "orders": [
         null,
         {
-            "@type": 
"com.gemstone.gemfire.rest.internal.web.controllers.Order",
+            "@type": "org.apache.geode.rest.internal.web.controllers.Order",
             "purchaseOrderNo": 1112,
             "customerId": 102,
             "description": "Purchase order for company - B",
@@ -93,7 +93,7 @@ Date: Sat, 18 Jan 2014 21:39:04 GMT
             ]
         },
         {
-            "@type": 
"com.gemstone.gemfire.rest.internal.web.controllers.Order",
+            "@type": "org.apache.geode.rest.internal.web.controllers.Order",
             "purchaseOrderNo": 11101,
             "customerId": 101,
             "description": "Purchase order for company - A",

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/get_regions.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/get_regions.html.md.erb 
b/rest_apps/get_regions.html.md.erb
index 73b4bc6..6633100 100644
--- a/rest_apps/get_regions.html.md.erb
+++ b/rest_apps/get_regions.html.md.erb
@@ -38,7 +38,7 @@ Date: Sat, 18 Jan 2014 20:05:47 GMT
             "name": "customers",
             "type": "REPLICATE",
             "key-constraint": "java.lang.String",
-            "value-constraint": "com.gemstone.gemfire.pdx.PdxInstance"
+            "value-constraint": "org.apache.geode.pdx.PdxInstance"
         },
         {
             "name": "items",
@@ -62,7 +62,7 @@ Date: Sat, 18 Jan 2014 20:05:47 GMT
             "name": "empty_region",
             "type": "EMPTY",
             "key-constraint": "java.lang.String",
-            "value-constraint": "com.gemstone.gemfire.pdx.PdxInstance"
+            "value-constraint": "org.apache.geode.pdx.PdxInstance"
         }
     ]
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/post_execute_functions.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/post_execute_functions.html.md.erb 
b/rest_apps/post_execute_functions.html.md.erb
index 019a3ee..ee7064c 100644
--- a/rest_apps/post_execute_functions.html.md.erb
+++ b/rest_apps/post_execute_functions.html.md.erb
@@ -31,7 +31,7 @@ Execute Geode function on entire cluster or on a specified 
region, members and m
                  "@value": 210
             },
             {
-                 "@type":  "com.gemstone.gemfire.web.rest.domain.Item",
+                 "@type":  "org.apache.geode.web.rest.domain.Item",
                  "itemNo":  "599",
                  "description":  "Part X Free on Bumper Offer",
                  "quantity":  "2",
@@ -55,7 +55,7 @@ Content-Type: application/json
              "@value": 210
         },
         {
-             "@type":  "com.gemstone.gemfire.web.rest.domain.Item",
+             "@type":  "org.apache.geode.web.rest.domain.Item",
              "itemNo":  "599",
              "description":  "Part X Free on Bumper Offer",
              "quantity":  "2",

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/post_execute_query.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/post_execute_query.html.md.erb 
b/rest_apps/post_execute_query.html.md.erb
index e46d325..38d9341 100644
--- a/rest_apps/post_execute_query.html.md.erb
+++ b/rest_apps/post_execute_query.html.md.erb
@@ -96,7 +96,7 @@ Content-Type: application/json
                  "itemNo": 1,
                  "unitPrice": 20,
                  "totalPrice": 200,
-                 "type-class":  "com.gemstone.gemfire.web.rest.domain.Item"
+                 "type-class":  "org.apache.geode.web.rest.domain.Item"
             },
             {
                  "description":  "Product-BBB",
@@ -104,11 +104,11 @@ Content-Type: application/json
                  "itemNo": 2,
                  "unitPrice": 10,
                  "totalPrice": 150,
-                 "type-class":  "com.gemstone.gemfire.web.rest.domain.Item"
+                 "type-class":  "org.apache.geode.web.rest.domain.Item"
             }
         ],
          "orderDate":  "Mon Feb 10 00:00:00 IST 2014",
-         "type-class":  "com.gemstone.gemfire.web.rest.domain.Order"
+         "type-class":  "org.apache.geode.web.rest.domain.Order"
     },
     {...},
     {...}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/post_if_absent_data.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/post_if_absent_data.html.md.erb 
b/rest_apps/post_if_absent_data.html.md.erb
index 8f7c395..ae1dd52 100644
--- a/rest_apps/post_if_absent_data.html.md.erb
+++ b/rest_apps/post_if_absent_data.html.md.erb
@@ -44,7 +44,7 @@ POST /gemfire-api/v1/orders?key=2
 Accept: application/json
 Content-Type: application/json
 {
-    "@type":  "com.gemstone.gemfire.web.rest.domain.Order",
+    "@type":  "org.apache.geode.web.rest.domain.Order",
      "purchaseOrderNo": 112,
      "customerId": 1012,
      "description":  "Purchase Order for myCompany",

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/put_multiple_values_for_keys.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/put_multiple_values_for_keys.html.md.erb 
b/rest_apps/put_multiple_values_for_keys.html.md.erb
index 7a70936..0cb3ed7 100644
--- a/rest_apps/put_multiple_values_for_keys.html.md.erb
+++ b/rest_apps/put_multiple_values_for_keys.html.md.erb
@@ -25,7 +25,7 @@ Accept: application/json
 Content-Type: application/json
 [
     {
-        "@type":  "com.gemstone.gemfire.web.rest.domain.Order",
+        "@type":  "org.apache.geode.web.rest.domain.Order",
          "purchaseOrderNo": 555,
          "customerId": 5,
          "description":  "Order for 23 Corp",
@@ -46,7 +46,7 @@ Content-Type: application/json
          "totalPrice": 99.9
     },
     {
-         "@type":  "com.gemstone.gemfire.web.rest.domain.Order",
+         "@type":  "org.apache.geode.web.rest.domain.Order",
          "purchaseOrderNo": 777,
          "customerId": 11,
          "description":  "Order for  MNP Corp",

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/put_replace_data.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/put_replace_data.html.md.erb 
b/rest_apps/put_replace_data.html.md.erb
index 6544ab5..8c03f1f 100644
--- a/rest_apps/put_replace_data.html.md.erb
+++ b/rest_apps/put_replace_data.html.md.erb
@@ -27,7 +27,7 @@ PUT //gemfire-api/v1/orders/2?op=REPLACE
 Accept: application/json
 Content-Type: application/json
 {
-     "@type":  "com.gemstone.gemfire.web.rest.domain.Order",
+     "@type":  "org.apache.geode.web.rest.domain.Order",
      "purchaseOrderNo": 1121,
      "customerId": 1012,
      "description":  "Order for XYZ Corp",

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/put_update_cas_data.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/put_update_cas_data.html.md.erb 
b/rest_apps/put_update_cas_data.html.md.erb
index 6538e4c..88ea86c 100644
--- a/rest_apps/put_update_cas_data.html.md.erb
+++ b/rest_apps/put_update_cas_data.html.md.erb
@@ -41,7 +41,7 @@ 
http://<hostname_or_http-service-bind-address>:<http-service-port>/gemfire-api/v
 <td>@old</td>
 <td>Compare this value to the existing value in the region.</td>
 <td><pre class="pre codeblock"><code>{
-         &quot;@type&quot;:  
&quot;com.gemstone.gemfire.web.rest.domain.Order&quot;,
+         &quot;@type&quot;:  
&quot;org.apache.geode.web.rest.domain.Order&quot;,
          &quot;purchaseOrderNo&quot;: 1121,
          &quot;customerId&quot;: 1012,
          &quot;description&quot;:  &quot;Order for  XYZ Corp&quot;,
@@ -66,7 +66,7 @@ 
http://<hostname_or_http-service-bind-address>:<http-service-port>/gemfire-api/v
 <td>@new</td>
 <td>If @old value matches existing value, use this value to replace the 
existing value.</td>
 <td><pre class="pre codeblock"><code>{
-         &quot;@type&quot;:  
&quot;com.gemstone.gemfire.web.rest.domain.Order&quot;,
+         &quot;@type&quot;:  
&quot;org.apache.geode.web.rest.domain.Order&quot;,
          &quot;purchaseOrderNo&quot;: 1121,
          &quot;customerId&quot;: 1013,
          &quot;description&quot;:  &quot;Order for  New Corp&quot;,
@@ -101,7 +101,7 @@ Accept: application/json
 Content-Type: application/json
 {
     "@old": {
-         "@type":  "com.gemstone.gemfire.web.rest.domain.Order",
+         "@type":  "org.apache.geode.web.rest.domain.Order",
          "purchaseOrderNo": 1121,
          "customerId": 1012,
          "description":  "Order for  XYZ Corp",
@@ -122,7 +122,7 @@ Content-Type: application/json
          "totalPrice": 225
     },
      "@new ": {
-         "@type":  "com.gemstone.gemfire.web.rest.domain.Order",
+         "@type":  "org.apache.geode.web.rest.domain.Order",
          "purchaseOrderNo": 1121,
          "customerId": 1013,
          "description":  "Order for  New Corp",

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/put_update_data.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/put_update_data.html.md.erb 
b/rest_apps/put_update_data.html.md.erb
index 108c045..0f98c25 100644
--- a/rest_apps/put_update_data.html.md.erb
+++ b/rest_apps/put_update_data.html.md.erb
@@ -22,7 +22,7 @@ Request Payload: application/json
 Content-Type: application/json
 Accept: application/json
 {
-    "@type": "com.gemstone.gemfire.web.rest.domain.Order",
+    "@type": "org.apache.geode.web.rest.domain.Order",
      "purchaseOrderNo": 1121,
      "customerId": 1012,
      "description":  "Order for XYZ Corp",

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/rest_examples.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/rest_examples.html.md.erb 
b/rest_apps/rest_examples.html.md.erb
index 18e2de3..3994ff0 100644
--- a/rest_apps/rest_examples.html.md.erb
+++ b/rest_apps/rest_examples.html.md.erb
@@ -30,7 +30,7 @@ The following Java examples assume a project directory 
structure similar to the
 ## \#1. REST Java Client (RestClientApp.java)
 
 ``` pre
-package com.gemstone.gemfire.restclient;
+package org.apache.geode.restclient;
 
  import org.springframework.http.HttpHeaders;
  import org.springframework.http.MediaType;
@@ -40,7 +40,7 @@ package com.gemstone.gemfire.restclient;
  import org.springframework.web.client.HttpClientErrorException;
  import org.springframework.web.client.HttpServerErrorException;
 
- import com.gemstone.gemfire.util.RestClientUtils;
+ import org.apache.geode.util.RestClientUtils;
 
  import java.util.ArrayList;
  import java.util.List;
@@ -50,7 +50,7 @@ package com.gemstone.gemfire.restclient;
    private static final String PEOPLE_REGION =  "/People";
 
    private static final String PERSON1_AS_JSON =  "{"
-          +  "\"@type\ ": \"com.gemstone.gemfire.domain.Person\ "," +  "\"id\ 
": 1,"
+          +  "\"@type\ ": \"org.apache.geode.domain.Person\ "," +  "\"id\ ": 
1,"
        +  " \"firstName\ ": \"Jane\ "," +  " \"middleName\ ": \"H\ ","
        +  " \"lastName\ ": \"Doe1\ "," +  " \"birthDate\ ": \"04/12/1983\ ","
        +  "\"gender\ ": \"MALE\ "" + "}";
@@ -95,21 +95,21 @@ package com.gemstone.gemfire.restclient;
 ## \#1a. Geode Cache Java Client (MyJavaClient.java)
 
 ``` pre
-package com.gemstone.gemfire.javaclient;
+package org.apache.geode.javaclient;
 
  import java.util.Calendar;
  import java.util.HashMap;
  import java.util.Map;
 
- import com.gemstone.gemfire.cache.Region;
- import com.gemstone.gemfire.cache.client.ClientCache;
- import com.gemstone.gemfire.cache.client.ClientCacheFactory;
- import com.gemstone.gemfire.cache.client.ClientRegionFactory;
- import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
- import com.gemstone.gemfire.domain.Gender;
- import com.gemstone.gemfire.domain.Person;
- import com.gemstone.gemfire.pdx.PdxInstance;
- import com.gemstone.gemfire.util.DateTimeUtils;
+ import org.apache.geode.cache.Region;
+ import org.apache.geode.cache.client.ClientCache;
+ import org.apache.geode.cache.client.ClientCacheFactory;
+ import org.apache.geode.cache.client.ClientRegionFactory;
+ import org.apache.geode.cache.client.ClientRegionShortcut;
+ import org.apache.geode.domain.Gender;
+ import org.apache.geode.domain.Person;
+ import org.apache.geode.pdx.PdxInstance;
+ import org.apache.geode.util.DateTimeUtils;
 
  public class MyJavaClient {
 
@@ -190,7 +190,7 @@ package com.gemstone.gemfire.javaclient;
 ## \#1b. REST Client Utilities (RestClientUtils.java)
 
 ``` pre
-package com.gemstone.gemfire.util;
+package org.apache.geode.util;
 
 
  import java.net.URI;
@@ -264,7 +264,7 @@ package com.gemstone.gemfire.util;
 ## \#1c. Date and Time Utilities (DateTimeUtils.java)
 
 ``` pre
-package com.gemstone.gemfire.util;
+package org.apache.geode.util;
 
 
  import java.text.SimpleDateFormat;
@@ -300,17 +300,17 @@ package com.gemstone.gemfire.util;
 ## \#1d. Person Class (Person.java)
 
 ``` pre
-package com.gemstone.gemfire.domain;
+package org.apache.geode.domain;
 
 
  import java.util.Date;
 
- import com.gemstone.gemfire.internal.lang.ObjectUtils;
- import com.gemstone.gemfire.pdx.PdxReader;
- import com.gemstone.gemfire.pdx.PdxSerializable;
- import com.gemstone.gemfire.pdx.PdxWriter;
+ import org.apache.geode.internal.lang.ObjectUtils;
+ import org.apache.geode.pdx.PdxReader;
+ import org.apache.geode.pdx.PdxSerializable;
+ import org.apache.geode.pdx.PdxWriter;
 
- import com.gemstone.gemfire.util.DateTimeUtils;
+ import org.apache.geode.util.DateTimeUtils;
 
 /**
  * The Person class is an abstraction modeling a person.
@@ -470,7 +470,7 @@ package com.gemstone.gemfire.domain;
 ## \#1e. Gender Class (Gender.java)
 
 ``` pre
-package com.gemstone.gemfire.domain;
+package org.apache.geode.domain;
 
 /**
  * The Gender  enum is a enumeration of genders (sexes).
@@ -498,7 +498,7 @@ class JsonSerializable
 
   def to_json
     hash = {}
-    hash["@type"] = "com.gemstone.gemfire.web.rest.domain.Person"
+    hash["@type"] = "org.apache.geode.web.rest.domain.Person"
     self.instance_variables.each do |var|
       if !var.to_s.end_with?("links")
         hash[var.to_s[1..-1]] = self.instance_variable_get var
@@ -600,7 +600,7 @@ Person is...
 Person modified is...
  { type = Person, id = 1, firstName = Jack, middleName = H, lastName = Handy, 
birthDate = 04/12/1983, gender = MALE}
 JSON sent to Server for Person with ID 1...
- 
{"@type":"com.gemstone.gemfire.web.rest.domain.Person","id":1,"firstName":"Jack","middleName":"H","lastName":"Handy","birthDate":"04/12/1983","gender":"MALE"}
+ 
{"@type":"org.apache.geode.web.rest.domain.Person","id":1,"firstName":"Jack","middleName":"H","lastName":"Handy","birthDate":"04/12/1983","gender":"MALE"}
 ```
 
 ## \#3. Python REST Client (restClient.py)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/rest_apps/setup_config.html.md.erb
----------------------------------------------------------------------
diff --git a/rest_apps/setup_config.html.md.erb 
b/rest_apps/setup_config.html.md.erb
index 4a848b2..e0daa48 100644
--- a/rest_apps/setup_config.html.md.erb
+++ b/rest_apps/setup_config.html.md.erb
@@ -135,7 +135,7 @@ The following procedure starts up a REST API 
service-enabled Geode deployment:
 You can also start up and configure Geode REST services programmatically. For 
example:
 
 ``` pre
-    import com.gemstone.gemfire.distributed.ServerLauncher;
+    import org.apache.geode.distributed.ServerLauncher;
 
      public class MyEmbeddedRestServer {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/tools_modules/gemcached/deploying_gemcached.html.md.erb
----------------------------------------------------------------------
diff --git a/tools_modules/gemcached/deploying_gemcached.html.md.erb 
b/tools_modules/gemcached/deploying_gemcached.html.md.erb
index bd789fb..b2fbc00 100644
--- a/tools_modules/gemcached/deploying_gemcached.html.md.erb
+++ b/tools_modules/gemcached/deploying_gemcached.html.md.erb
@@ -8,7 +8,7 @@ The following sections describe how to configure and deploy an 
embedded Gemcache
 
 ## <a 
id="topic_7B158074B27A4FEF9D38E7C369905C72__section_17E7E4058D914334B9C5AC2E3DC1F7F2"
 class="no-quick-link"></a>Embedding a Gemcached server in a Geode Java 
Application
 
-The `com.gemstone.gemfire.memcached` package contains a single class, 
`GemFireMemcachedServer`. (See the [Geode 
Javadocs](http://static.springsource.org/spring-gemfire/docs/current/api/).) 
Use this class to configure and embed a Gemcached server in a Geode cache 
server. For example, the following statement creates and starts an embedded 
Gemcached server on port number 5555 using the binary protocol:
+The `org.apache.geode.memcached` package contains a single class, 
`GemFireMemcachedServer`. (See the [Geode 
Javadocs](http://static.springsource.org/spring-gemfire/docs/current/api/).) 
Use this class to configure and embed a Gemcached server in a Geode cache 
server. For example, the following statement creates and starts an embedded 
Gemcached server on port number 5555 using the binary protocol:
 
 ``` pre
 GemFireMemcachedServer server = 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/tools_modules/gfsh/command-pages/create.html.md.erb
----------------------------------------------------------------------
diff --git a/tools_modules/gfsh/command-pages/create.html.md.erb 
b/tools_modules/gfsh/command-pages/create.html.md.erb
index 92b652b..9864fb2 100644
--- a/tools_modules/gfsh/command-pages/create.html.md.erb
+++ b/tools_modules/gfsh/command-pages/create.html.md.erb
@@ -211,7 +211,7 @@ If index creation fails, you may receive an error message 
in gfsh similar to the
 
 ``` pre
 gfsh>create defined indexes
-Exception : com.gemstone.gemfire.cache.query.RegionNotFoundException , 
+Exception : org.apache.geode.cache.query.RegionNotFoundException , 
 Message : Region ' /r3' not found: from  /r3Occurred on following members
 1. india(s1:17866)<v1>:27809
 ```
@@ -889,7 +889,7 @@ See [Region Data Storage and 
Distribution](../../../developing/region_options/ch
 </tr>
 <tr class="even">
 <td><span class="keyword parmname">\-\-compressor</span></td>
-<td>Java class name that implements compression for the region. You can write 
a custom compressor that implements <code class="ph 
codeph">com.gemstone.gemfire.compression.Compressor</code> or you can specify 
the Snappy compressor (<code class="ph 
codeph">com.gemstone.gemfire.compression.SnappyCompressor</code>), which is 
bundled with Geode. See <a 
href="../../../managing/region_compression/region_compression.html#topic_r43_wgc_gl">Region
 Compression</a>.</td>
+<td>Java class name that implements compression for the region. You can write 
a custom compressor that implements <code class="ph 
codeph">org.apache.geode.compression.Compressor</code> or you can specify the 
Snappy compressor (<code class="ph 
codeph">org.apache.geode.compression.SnappyCompressor</code>), which is bundled 
with Geode. See <a 
href="../../../managing/region_compression/region_compression.html#topic_r43_wgc_gl">Region
 Compression</a>.</td>
 <td>no compression</td>
 </tr>
 <tr class="odd">
@@ -906,22 +906,22 @@ See [Region Data Storage and 
Distribution](../../../developing/region_options/ch
 
 ``` pre
 create region --name=region1 --type=REPLICATE_PERSISTENT \
---cache-writer=com.gemstone.gemfire.examples.MyCacheWriter \
+--cache-writer=org.apache.geode.examples.MyCacheWriter \
 --group=Group1 --disk-store=DiskStore1
 
 create region --name=region12 --template-region=/region1
 
 create region --name=region2 --type=REPLICATE \
---cache-listener=com.gemstone.gemfire.examples.MyCacheListener1,\
-com.gemstone.gemfire.examples.MyCacheListener2 \
+--cache-listener=org.apache.geode.examples.MyCacheListener1,\
+org.apache.geode.examples.MyCacheListener2 \
 --group=Group1,Group2
 
 create region --name=region3 --type=PARTITION_PERSISTENT --redundant-copies=2 
--total-max-memory=1000 \
 --startup-recovery-delay=5 --total-num-buckets=100 --disk-store=DiskStore2 \
---cache-listener=com.gemstone.gemfire.examples.MyCacheListener3 \
+--cache-listener=org.apache.geode.examples.MyCacheListener3 \
 --group=Group2 
 
-create region --name=region4 --type=REPLICATE_PROXY 
--cache-listener=com.gemstone.gemfire.examples.MyCacheListener1 
+create region --name=region4 --type=REPLICATE_PROXY 
--cache-listener=org.apache.geode.examples.MyCacheListener1 
 --group=Group1,Group2
 ```
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/tools_modules/gfsh/getting_started_gfsh.html.md.erb
----------------------------------------------------------------------
diff --git a/tools_modules/gfsh/getting_started_gfsh.html.md.erb 
b/tools_modules/gfsh/getting_started_gfsh.html.md.erb
index bc312fa..239114c 100644
--- a/tools_modules/gfsh/getting_started_gfsh.html.md.erb
+++ b/tools_modules/gfsh/getting_started_gfsh.html.md.erb
@@ -114,7 +114,7 @@ by using the backslash character ('\\') as a delimiter. For 
example:
 ``` pre
 gfsh>create region --name=region1 \
 --type=REPLICATE_PERSISTENT \
---cache-writer=com.gemstone.gemfire.examples.MyCacheWriter \
+--cache-writer=org.apache.geode.examples.MyCacheWriter \
 --group=Group1 --disk-store=DiskStore1
 ```
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/tools_modules/hibernate_cache/changing_gemfire_default_cfg.html.md.erb
----------------------------------------------------------------------
diff --git 
a/tools_modules/hibernate_cache/changing_gemfire_default_cfg.html.md.erb 
b/tools_modules/hibernate_cache/changing_gemfire_default_cfg.html.md.erb
index 58e72fc..0424a58 100644
--- a/tools_modules/hibernate_cache/changing_gemfire_default_cfg.html.md.erb
+++ b/tools_modules/hibernate_cache/changing_gemfire_default_cfg.html.md.erb
@@ -125,13 +125,13 @@ In a Hibernate application, the caching of query results 
is recommended for quer
 
 ## <a 
id="changing_gemfire_default_cfg__section_E884BF4251D6494695408B30D1F350B1" 
class="no-quick-link"></a>Remapping the Hibernate EnumType with the Geode 
EnumType
 
-Due to an issue with Hibernate in a client-server topology, application 
classes must be present on the Geode cache server when a Hibernate application 
uses annotations. If you do not want to place the application classes on the 
Geode cache server, you can modify the Hibernate configuration to use the 
`com.gemstone.gemfire.modules.hibernate.EnumType` in place of 
`org.hibernate.type.EnumType`.
+Due to an issue with Hibernate in a client-server topology, application 
classes must be present on the Geode cache server when a Hibernate application 
uses annotations. If you do not want to place the application classes on the 
Geode cache server, you can modify the Hibernate configuration to use the 
`org.apache.geode.modules.hibernate.EnumType` in place of 
`org.hibernate.type.EnumType`.
 
 To configure Hibernate to use the Geode EnumType, modify `hibernate.cfg.xml` 
to add a property for the mapping. For example:
 
 ``` pre
 <property name="myEnum">
-    <type name="com.gemstone.gemfire.modules.hibernate.EnumType">
+    <type name="org.apache.geode.modules.hibernate.EnumType">
     <param name="enumClass">com.mycompany.MyEnum</param>
    </type>
 </property>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/tools_modules/hibernate_cache/setting_up_the_module.html.md.erb
----------------------------------------------------------------------
diff --git a/tools_modules/hibernate_cache/setting_up_the_module.html.md.erb 
b/tools_modules/hibernate_cache/setting_up_the_module.html.md.erb
index e304280..cc3702e 100644
--- a/tools_modules/hibernate_cache/setting_up_the_module.html.md.erb
+++ b/tools_modules/hibernate_cache/setting_up_the_module.html.md.erb
@@ -21,7 +21,7 @@ Edit the `hibernate.cfg.xml` file to use the Hibernate Cache 
module.
 
     ``` pre
     <property name="hibernate.cache.region.factory_class">
-      com.gemstone.gemfire.modules.hibernate.GemFireRegionFactory
+      org.apache.geode.modules.hibernate.GemFireRegionFactory
     </property> 
     ```
 
@@ -84,7 +84,7 @@ Edit the `hibernate.cfg.xml` file to use the Hibernate Cache 
module.
     Similar to Hibernate, Geode uses Simple Logging Facade for Java (SLF4J) to 
log messages. Upon successful startup, Geode will log the following message:
 
     ``` pre
-    2010-11-15 INFO 
[com.gemstone.gemfire.modules.hibernate.GemFireRegionFactory] - 
+    2010-11-15 INFO [org.apache.geode.modules.hibernate.GemFireRegionFactory] 
- 
         <Initializing Apache Geode Modules Version 1.1>
     ```
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23e2f5ce/tools_modules/http_session_mgmt/quick_start.html.md.erb
----------------------------------------------------------------------
diff --git a/tools_modules/http_session_mgmt/quick_start.html.md.erb 
b/tools_modules/http_session_mgmt/quick_start.html.md.erb
index 9b4f70e..b349bb8 100644
--- a/tools_modules/http_session_mgmt/quick_start.html.md.erb
+++ b/tools_modules/http_session_mgmt/quick_start.html.md.erb
@@ -63,7 +63,7 @@ These steps provide a basic starting point for using the 
Tomcat module. For more
     For example, in a peer-to-peer configuration using Tomcat 7, you would add 
the following entry within the `<server>` element of server.xml:
 
     ``` pre
-    <Listener className="com.gemstone.gemfire.modules.session.catalina.
+    <Listener className="org.apache.geode.modules.session.catalina.
                              PeerToPeerCacheLifecycleListener"
                              locator="localhost[10334]" />
     ```
@@ -71,7 +71,7 @@ These steps provide a basic starting point for using the 
Tomcat module. For more
     and the following entry within the `<context>` tag in the context.xml file:
 
     ``` pre
-    <Manager className="com.gemstone.gemfire.modules.session.catalina.
+    <Manager className="org.apache.geode.modules.session.catalina.
                              Tomcat7DeltaSessionManager"/> 
     ```
 


Reply via email to