Replace all NarrowedRelationDef with Narrowed