Rename structure as per component diagram change (Removal of IR)