updates to accomodate component_URI name changes