diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 0472343..180b890 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -126,196 +126,196 @@ data:
         rpms:
             eclipse:
                 buildorder: 40
-                ref: stream-eclipse-rhel8-rhel-8.3.0
+                ref: changed/i8c-stream-rhel8/eclipse-4.16-7.module+el8.3.0+8498+807b4491
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
             eclipse-ecf:
                 buildorder: 30
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/eclipse-ecf-3.14.8-1.module+el8.3.0+8451+e8177ea0
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse.
             eclipse-emf:
                 buildorder: 20
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/eclipse-emf-2.22.0-1.module+el8.3.0+8451+e8177ea0
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-ecf.
             apache-commons-compress:
                 buildorder: 20
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/apache-commons-compress-1.20-3.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of jgit, jython.
             apache-commons-jxpath:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/apache-commons-jxpath-1.3-36.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             apiguardian:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/apiguardian-1.1.0-4.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, junit5.
             batik:
                 buildorder: 20
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/batik-1.11-6.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             felix-gogo-command:
                 buildorder: 20
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/felix-gogo-command-1.0.2-11.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             felix-gogo-runtime:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/felix-gogo-runtime-1.1.0-7.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, felix-gogo-command,
                          felix-gogo-shell.
             felix-gogo-shell:
                 buildorder: 20
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/felix-gogo-shell-1.1.0-5.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             felix-scr:
                 buildorder: 30
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/felix-scr-2.1.16-6.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             glassfish-annotation-api:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/glassfish-annotation-api-1.3.2-3.module+el8.2.1+6727+059d025f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             glassfish-el:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/glassfish-el-3.0.1-0.14.b08.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, glassfish-jsp-api.
             glassfish-jsp:
                 buildorder: 30
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/glassfish-jsp-2.3.4-6.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             glassfish-jsp-api:
                 buildorder: 20
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/glassfish-jsp-api-2.3.3-3.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, glassfish-jsp.
             glassfish-servlet-api:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/glassfish-servlet-api-3.1.0-19.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, glassfish-jsp-api, jetty.
             google-gson:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/google-gson-2.8.6-5.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-cdt, jgit,
                          eclipse-m2e-core, eclipse-webtools.
             hamcrest:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/hamcrest-1.3-29.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, junit.
             icu4j:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/icu4j-65.1-3.module+el8.2.1+6727+059d025f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, jython.
             jetty:
                 buildorder: 20
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/jetty-9.4.30-2.v20200611.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, jgit,
                          eclipse-m2e-core, eclipse-webtools.
             jsch:
                 buildorder: 20
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/jsch-0.1.54-12.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, jgit.
             junit:
                 buildorder: 20
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/junit-4.12-14.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, junit5.
             junit5:
                 buildorder: 30
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/junit5-5.6.2-2.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             jzlib:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/jzlib-1.1.3-14.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of jgit, jsch.
             lucene:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/lucene-8.4.1-5.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-m2e-core, maven-indexer.
             objectweb-asm:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/objectweb-asm-7.3.1-3.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-ecf, jython.
             opentest4j:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/opentest4j-1.2.0-2.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, junit5.
             sat4j:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/sat4j-2.3.5-19.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse.
             univocity-parsers:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/univocity-parsers-2.8.4-3.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of junit5.
             xml-commons-apis:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/xml-commons-apis-1.4.01-31.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of batik, eclipse, eclipse-emf.
             xmlgraphics-commons:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/xmlgraphics-commons-2.3-4.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of batik.
             xz-java:
                 buildorder: 10
-                ref: stream-eclipse-rhel8-rhel-8.2.1
+                ref: changed/i8c-stream-rhel8/xz-java-1.8-8.module+el8.2.1+7436+4afdca1f
                 arches: [x86_64]
                 rationale: >
                     Runtime dependency of eclipse, apache-commons-compress.