diff --git a/README.md b/README.md
index 99b3094d..281fecd1 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ API Documentation
 
 @htmlonly
 
-<a href="http://iotdk.intel.com/docs/master/upm/"><img src="docs/c++.png"/></a>
+<a href="http://iotdk.intel.com/docs/master/upm/modules.html"><img src="docs/c++.png"/></a>
 <a href="http://iotdk.intel.com/docs/master/upm/python"><img src="docs/python.png"/></a>
 <a href="http://iotdk.intel.com/docs/master/upm/node"><img src="docs/node.png"/></a>
 
diff --git a/doxy/index.rst b/doxy/index.rst
index caf9e6d9..c335fbcc 100644
--- a/doxy/index.rst
+++ b/doxy/index.rst
@@ -57,7 +57,7 @@ Don't forget to check the documentation `section <https://github.com/intel-iot-d
 ###########################
 
 .. image:: ../docs/c++.png
-   :target: http://iotdk.intel.com/docs/master/upm/
+   :target: http://iotdk.intel.com/docs/master/upm/modules.html
 .. image:: ../docs/python.png
    :target: http://iotdk.intel.com/docs/master/upm/python
 .. image:: ../docs/node.png
diff --git a/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars b/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
index 97b21c59..99f7189f 100644
--- a/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
+++ b/doxy/node/generators/yuidoc/tmpl/partials/index.handlebars
@@ -104,12 +104,12 @@
       </div>
     </div>
     <div class="section" id="api-documentation"> 
-      <h1><strong>API Documentation</strong><a class="headerlink"
+      <h1><strong>Other API Documentation</strong><a class="headerlink"
                                                href="#api-documentation"
                                                title="Permalink to this headline"></a></h1>
       
 
-      <p><a href="http://iotdk.intel.com/docs/master/upm/"><img src="../docs/c++.png" /></a>
+      <p><a href="http://iotdk.intel.com/docs/master/upm/modules.html"><img src="../docs/c++.png" /></a>
       <a href="http://iotdk.intel.com/docs/master/upm/python"><img src="../docs/python.png" /></a>
       <a href="http://iotdk.intel.com/docs/master/upm/node"><img src="../docs/node.png" /></a>
       </p>