diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 48095e4..6865da3 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,6 +1,8 @@
 document: modulemd
 version: 2
 data:
+    name: python36
+    stream: 3.6
     summary: Python programming language, version 3.6
     description: |-
         This module gives users access to the internal Python 3.6 in RHEL8, as
@@ -83,7 +85,7 @@ data:
                     Contains the symlink to the platform-python interpreter.
                     Also contains python36-rpm-macros needed to build the
                     remaining packages.
-                ref: stream-3.6
+                ref: stream-3.6-rhel-8.0.0
                 buildorder: 10
             python-PyMySQL:
                 rationale: Python adapter for the MySQL/MariaDB databases
@@ -104,42 +106,42 @@ data:
                 # [2] https://bugzilla.redhat.com/show_bug.cgi?id=1012475
                 # [3] python-maint@redhat.com mailing list, 2018-04-30, subject
                 #     "python-MySQL vs PyMySQL"
-                ref: stream-0.8.0
+                ref: stream-0.8.0-rhel-8.0.0
                 buildorder: 20
             python-docutils:
                 rationale: System for processing plaintext documentation
-                ref: stream-0.14
+                ref: stream-0.14-rhel-8.0.0
                 buildorder: 20
             python-nose:
                 rationale: Discovery-based unit test extension for Python
-                ref: stream-1.3.7
+                ref: stream-1.3.7-rhel-8.0.0
                 buildorder: 20
             python-pygments:
                 rationale: Syntax highlighting engine written in Python
-                ref: stream-2.2.0
+                ref: stream-2.2.0-rhel-8.0.0
                 buildorder: 20
             python-pymongo:
                 # Package maintainer: mskalick
                 rationale: Python driver for MongoDB
-                ref: stream-3.6.1
+                ref: stream-3.6.1-rhel-8.0.0
                 buildorder: 20
             python-sqlalchemy:
                 rationale: Modular and flexible ORM library for python
-                ref: stream-1.2.7
+                ref: stream-1.3.2-rhel-8.0.0
                 buildorder: 20
             python-virtualenv:
                 rationale: Tool to create isolated Python environments
-                ref: stream-15.1.0
+                ref: stream-15.1.0-rhel-8.0.0
                 buildorder: 20
             python-wheel:
                 rationale: Built-package format for Python
-                ref: stream-0.30.0
+                ref: stream-0.30.0-rhel-8.0.0
                 buildorder: 20
             scipy:
                 rationale: Scientific Tools for Python
-                ref: stream-1.0.0
+                ref: stream-1.0.0-rhel-8.0.0
                 buildorder: 20
             python-docs:
                 rationale: Documentation for Python
-                ref: stream-3.6
+                ref: stream-3.6-rhel-8.0.0
                 buildorder: 20