diff --git a/etc/default_data.json b/etc/default_data.json
index 8278849c6..0dfa8e98d 100644
--- a/etc/default_data.json
+++ b/etc/default_data.json
@@ -15580,8 +15580,8 @@
             "aliases": [
                 "fuel"
             ],
-            "uri": "git://git.openstack.org/stackforge/fuel-main.git",
-            "organization": "stackforge"
+            "uri": "git://git.openstack.org/openstack/fuel-main.git",
+            "organization": "openstack"
         },
         {
             "module": "api-wg",
@@ -15774,9 +15774,6 @@
         {
             "organization": "openstack-ops"
         },
-        {
-            "organization": "stackforge"
-        },
         {
             "organization": "cloudfoundry",
             "uri": "github://"
@@ -16027,7 +16024,7 @@
         {
             "id": "all",
             "title": "All",
-            "modules": ["openstack", "openstack-infra", "openstack-dev", "stackforge", "unknown"]
+            "modules": ["openstack", "openstack-infra", "openstack-dev", "unknown"]
         },
         {
             "id": "openstack",
@@ -16057,11 +16054,6 @@
             "title": "OpenStack Others",
             "modules": ["openstack-others", "unknown"]
         },
-        {
-            "id": "stackforge",
-            "title": "Stackforge",
-            "modules": ["stackforge"]
-        },
         {
             "id": "complementary",
             "title": "Complementary",
diff --git a/etc/stackalytics.conf b/etc/stackalytics.conf
index 09cefb41e..2d023079c 100644
--- a/etc/stackalytics.conf
+++ b/etc/stackalytics.conf
@@ -95,7 +95,7 @@
 #runtime_storage_uri = memcached://127.0.0.1:11211
 
 # URI for default data (string value)
-#default_data_uri = https://git.openstack.org/cgit/stackforge/stackalytics/plain/etc/default_data.json
+#default_data_uri = https://git.openstack.org/cgit/openstack/stackalytics/plain/etc/default_data.json
 
 # The folder that holds all project sources to analyze (string value)
 #sources_root = /var/local/stackalytics
@@ -104,7 +104,7 @@
 #days_to_update_members = 30
 
 # The address of file with corrections data (string value)
-#corrections_uri = https://git.openstack.org/cgit/stackforge/stackalytics/plain/etc/corrections.json
+#corrections_uri = https://git.openstack.org/cgit/openstack/stackalytics/plain/etc/corrections.json
 
 # URI of review system (string value)
 #review_uri = gerrit://review.openstack.org
@@ -119,7 +119,7 @@
 #ssh_username = user
 
 # URI for default data (string value)
-#driverlog_data_uri = https://git.openstack.org/cgit/stackforge/driverlog/plain/etc/default_data.json
+#driverlog_data_uri = https://git.openstack.org/cgit/openstack/driverlog/plain/etc/default_data.json
 
 # How many member profiles to look ahead after the last (integer value)
 #members_look_ahead = 250
diff --git a/etc/test_default_data.json b/etc/test_default_data.json
index 68c5f9a0c..837c330cd 100644
--- a/etc/test_default_data.json
+++ b/etc/test_default_data.json
@@ -106,8 +106,8 @@
         },
         {
             "module": "stackalytics",
-            "organization": "stackforge",
-            "uri": "git://git.openstack.org/stackforge/stackalytics.git"
+            "organization": "openstack",
+            "uri": "git://git.openstack.org/openstack/stackalytics.git"
         }
     ],
 
@@ -269,7 +269,7 @@
         {
             "id": "all",
             "title": "All",
-            "modules": ["openstack", "openstack-infra", "openstack-dev", "stackforge", "unknown"]
+            "modules": ["openstack", "openstack-infra", "openstack-dev", "unknown"]
         },
         {
             "id": "openstack",
@@ -298,11 +298,6 @@
             "id": "openstack-others",
             "title": "OpenStack Others",
             "modules": ["openstack-others", "unknown"]
-        },
-        {
-            "id": "stackforge",
-            "title": "Stackforge",
-            "modules": ["stackforge"]
         }
     ]
 }
diff --git a/stackalytics/dashboard/templates/_macros/module_details.html b/stackalytics/dashboard/templates/_macros/module_details.html
index 8096dfa29..c30768e21 100644
--- a/stackalytics/dashboard/templates/_macros/module_details.html
+++ b/stackalytics/dashboard/templates/_macros/module_details.html
@@ -33,7 +33,7 @@
             {%/if%}
             {%if tag == 'group' %}
                 Custom module group as defined in
-                <a href="https://git.openstack.org/cgit/stackforge/stackalytics/tree/etc/default_data.json" target="_blank">default_data.json</a>
+                <a href="https://git.openstack.org/cgit/openstack/stackalytics/tree/etc/default_data.json" target="_blank">default_data.json</a>
             {%/if%}
         </div>
         <div>
diff --git a/stackalytics/dashboard/templates/reports/external_ci.html b/stackalytics/dashboard/templates/reports/external_ci.html
index d5ca228cb..3048b0958 100644
--- a/stackalytics/dashboard/templates/reports/external_ci.html
+++ b/stackalytics/dashboard/templates/reports/external_ci.html
@@ -216,7 +216,7 @@
 <p>List of drivers is taken from <a href="/report/driverlog" target="_blank">DriverLog</a>.
   The status is based on job results from the latest patch in merged change requests (thus assuming that the job is executed on code close to the master).
   Missing or misconfigured drivers can be updated by commit into DriverLog's
-  <a href="https://git.openstack.org/cgit/stackforge/driverlog/tree/etc/default_data.json" target="_blank">default_data.json</a>.
+  <a href="https://git.openstack.org/cgit/openstack/driverlog/tree/etc/default_data.json" target="_blank">default_data.json</a>.
 </p>
 
 <h2>Drivers summary</h2>
diff --git a/stackalytics/dashboard/templates/widget.html b/stackalytics/dashboard/templates/widget.html
index 5d4c1fe90..4f4c531cc 100644
--- a/stackalytics/dashboard/templates/widget.html
+++ b/stackalytics/dashboard/templates/widget.html
@@ -121,7 +121,8 @@
         </div>
 
         <div class="drop" style="margin-right: 15px;">
-            <label for="project_type_selector" title="Project type groups modules of same kind: official (integrated-release, other) or belonging to same organization (openstack, stackforge)">Project Type</label>
+            <label for="project_type_selector" title="Project type groups modules of the same kind. 'OpenStack' are projects defined in the official governance projects.yaml.
+                    'OpenStack Others' are projects not included into any program. 'Complementary' are projects related to OpenStack ecosystem">Project Type</label>
             <input type="hidden" id="project_type_selector" style="width: 95px" data-placeholder="Select project type"/>
         </div>
 
diff --git a/stackalytics/processor/config.py b/stackalytics/processor/config.py
index c56c70da0..f0e48a403 100644
--- a/stackalytics/processor/config.py
+++ b/stackalytics/processor/config.py
@@ -26,7 +26,7 @@ CONNECTION_OPTS = [
 PROCESSOR_OPTS = [
     cfg.StrOpt('default-data-uri',
                default='https://git.openstack.org/cgit/'
-                       'stackforge/stackalytics/plain/etc/default_data.json',
+                       'openstack/stackalytics/plain/etc/default_data.json',
                help='URI for default data'),
     cfg.StrOpt('sources-root', default='/var/local/stackalytics',
                help='The folder that holds all project sources to analyze'),
@@ -34,7 +34,7 @@ PROCESSOR_OPTS = [
                help='Number of days to update members'),
     cfg.StrOpt('corrections-uri',
                default=('https://git.openstack.org/cgit/'
-                        'stackforge/stackalytics/plain/etc/corrections.json'),
+                        'openstack/stackalytics/plain/etc/corrections.json'),
                help='The address of file with corrections data'),
     cfg.StrOpt('review-uri', default='gerrit://review.openstack.org',
                help='URI of review system'),
@@ -46,7 +46,7 @@ PROCESSOR_OPTS = [
                help='SSH username for gerrit review system access'),
     cfg.StrOpt('driverlog-data-uri',
                default='https://git.openstack.org/cgit/'
-                       'stackforge/driverlog/plain/etc/default_data.json',
+                       'openstack/driverlog/plain/etc/default_data.json',
                help='URI for default data'),
     cfg.IntOpt('members-look-ahead', default=250,
                help='How many member profiles to look ahead after the last'),