First step in streamlining the code to create sub-references. Slightly renaming the class to fit the schema and avoid conflicts. Bug: T373849 Change-Id: Iadbdbecbedf4d4aa3f0e0bade88ea020f2570926