Updated nomenclature, no longer have subsystem tags