Index: flang/include/flang/Semantics/scope.h
===================================================================
--- flang/include/flang/Semantics/scope.h
+++ flang/include/flang/Semantics/scope.h
@@ -61,7 +61,7 @@
 public:
   ENUM_CLASS(Kind, Global, IntrinsicModules, Module, MainProgram, Subprogram,
       BlockData, DerivedType, BlockConstruct, Forall, OtherConstruct,
-      ImpliedDos)
+      ImpliedDos, OMPACCConstruct)
   using ImportKind = common::ImportKind;
 
   // Create the Global scope -- the root of the scope tree
Index: flang/lib/Semantics/resolve-directives.cpp
===================================================================
--- flang/lib/Semantics/resolve-directives.cpp
+++ flang/lib/Semantics/resolve-directives.cpp
@@ -1300,7 +1300,7 @@
         if (ordCollapseLevel) {
           if (const auto *details{iv->symbol->detailsIf<HostAssocDetails>()}) {
             const Symbol *tpSymbol = &details->symbol();
-            if (tpSymbol->test(Symbol::Flag::OmpThreadprivate)) {
+            if (tpSymbol->GetUltimate().test(Symbol::Flag::OmpThreadprivate)) {
               context_.Say(iv->source,
                   "Loop iteration variable %s is not allowed in THREADPRIVATE."_err_en_US,
                   iv->ToString());
Index: flang/lib/Semantics/resolve-names.cpp
===================================================================
--- flang/lib/Semantics/resolve-names.cpp
+++ flang/lib/Semantics/resolve-names.cpp
@@ -1336,7 +1336,7 @@
 
 bool AccVisitor::Pre(const parser::OpenACCBlockConstruct &x) {
   if (NeedsScope(x)) {
-    PushScope(Scope::Kind::OtherConstruct, nullptr);
+    PushScope(Scope::Kind::OMPACCConstruct, nullptr);
   }
   return true;
 }
@@ -1372,7 +1372,7 @@
   }
 
   bool Pre(const parser::OpenMPLoopConstruct &) {
-    PushScope(Scope::Kind::OtherConstruct, nullptr);
+    PushScope(Scope::Kind::OMPACCConstruct, nullptr);
     return true;
   }
   void Post(const parser::OpenMPLoopConstruct &) { PopScope(); }
@@ -1392,7 +1392,7 @@
   }
 
   bool Pre(const parser::OpenMPSectionsConstruct &) {
-    PushScope(Scope::Kind::OtherConstruct, nullptr);
+    PushScope(Scope::Kind::OMPACCConstruct, nullptr);
     return true;
   }
   void Post(const parser::OpenMPSectionsConstruct &) { PopScope(); }
@@ -1433,7 +1433,7 @@
 
 bool OmpVisitor::Pre(const parser::OpenMPBlockConstruct &x) {
   if (NeedsScope(x)) {
-    PushScope(Scope::Kind::OtherConstruct, nullptr);
+    PushScope(Scope::Kind::OMPACCConstruct, nullptr);
   }
   return true;
 }
@@ -2244,7 +2244,8 @@
   currScope_ = &scope;
   auto kind{currScope_->kind()};
   if (kind != Scope::Kind::BlockConstruct &&
-      kind != Scope::Kind::OtherConstruct) {
+      kind != Scope::Kind::OtherConstruct &&
+      kind != Scope::Kind::OMPACCConstruct) {
     BeginScope(scope);
   }
   // The name of a module or submodule cannot be "used" in its scope,
@@ -2328,8 +2329,10 @@
 }
 Symbol &ScopeHandler::MakeHostAssocSymbol(
     const parser::Name &name, const Symbol &hostSymbol) {
-  Symbol &symbol{*NonDerivedTypeScope()
-                      .try_emplace(name.source, HostAssocDetails{hostSymbol})
+  Scope *scope{&NonDerivedTypeScope()};
+  while (scope->kind() == Scope::Kind::OMPACCConstruct)
+    scope = &scope->parent();
+  Symbol &symbol{*scope->try_emplace(name.source, HostAssocDetails{hostSymbol})
                       .first->second};
   name.symbol = &symbol;
   symbol.attrs() = hostSymbol.attrs(); // TODO: except PRIVATE, PUBLIC?
Index: flang/test/Lower/OpenACC/hostassoc-useassoc.f90
===================================================================
--- /dev/null
+++ flang/test/Lower/OpenACC/hostassoc-useassoc.f90
@@ -0,0 +1,30 @@
+! This test checks lowering of host associated var in OpenACC region
+! and the host is use associated.
+
+! RUN: bbc -fopenacc -emit-fir %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-fir -fopenacc %s -o - | FileCheck %s
+
+module tpmod
+  real :: val = 2.0
+end module
+
+subroutine tptest
+  use tpmod
+  call tps()
+contains
+! CHECK-LABEL: func.func @_QFtptestPtps() {
+! CHECK:         %[[VAL_0:.*]] = fir.address_of(@_QMtpmodEval) : !fir.ref<f32>
+! CHECK:         acc.parallel {
+! CHECK:           %[[VAL_1:.*]] = arith.constant 1.000000e+00 : f32
+! CHECK:           fir.store %[[VAL_1]] to %[[VAL_0]] : !fir.ref<f32>
+! CHECK:           acc.yield
+! CHECK:         }
+! CHECK:         return
+! CHECK:       }
+
+  subroutine tps()
+    !$acc parallel
+      val = 1.0
+    !$acc end parallel
+  end subroutine
+end subroutine
Index: flang/test/Lower/OpenMP/hostassoc-useassoc.f90
===================================================================
--- /dev/null
+++ flang/test/Lower/OpenMP/hostassoc-useassoc.f90
@@ -0,0 +1,58 @@
+! This test checks lowering of host associated var in OpenMP region
+! and the host is use associated.
+
+! RUN: bbc -fopenmp -emit-fir %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | FileCheck %s
+
+module tpmod
+  real :: val = 2.0
+end module
+
+subroutine tptest
+  use tpmod
+  call tps()
+contains
+! CHECK-LABEL: func.func @_QFtptestPtps() {
+! CHECK:         %[[VAL_0:.*]] = fir.address_of(@_QMtpmodEval) : !fir.ref<f32>
+! CHECK:         omp.parallel   {
+! CHECK:           %[[VAL_1:.*]] = arith.constant 1.000000e+00 : f32
+! CHECK:           fir.store %[[VAL_1]] to %[[VAL_0]] : !fir.ref<f32>
+! CHECK:           omp.terminator
+! CHECK:         }
+! CHECK:         return
+! CHECK:       }
+
+  subroutine tps()
+    !$omp parallel
+    !$omp single
+      val = 1.0
+    !$omp end single
+    !$omp end parallel
+  end subroutine
+end subroutine
+
+subroutine tptest2
+  use tpmod
+  call tps()
+contains
+! CHECK-LABEL: func.func @_QFtptest2Ptps() {
+! CHECK:         %[[VAL_0:.*]] = fir.address_of(@_QMtpmodEval) : !fir.ref<f32>
+! CHECK:         omp.parallel   {
+! CHECK:           omp.single   {
+! CHECK:             %[[VAL_1:.*]] = arith.constant 1.000000e+00 : f32
+! CHECK:             fir.store %[[VAL_1]] to %[[VAL_0]] : !fir.ref<f32>
+! CHECK:             omp.terminator
+! CHECK:           }
+! CHECK:           omp.terminator
+! CHECK:         }
+! CHECK:         return
+! CHECK:       }
+
+  subroutine tps()
+    !$omp parallel
+    !$omp single
+      val = 1.0
+    !$omp end single
+    !$omp end parallel
+  end subroutine
+end subroutine
Index: flang/test/Semantics/OpenACC/acc-symbols01.f90
===================================================================
--- flang/test/Semantics/OpenACC/acc-symbols01.f90
+++ flang/test/Semantics/OpenACC/acc-symbols01.f90
@@ -14,11 +14,11 @@
   b = 2
  !$acc parallel present(c) firstprivate(b) private(a)
  !$acc loop
-  !DEF: /mm/OtherConstruct1/i (AccPrivate, AccPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /mm/OMPACCConstruct1/i (AccPrivate, AccPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-   !DEF: /mm/OtherConstruct1/a (AccPrivate) HostAssoc INTEGER(4)
-   !REF: /mm/OtherConstruct1/i
-   !DEF: /mm/OtherConstruct1/b (AccFirstPrivate) HostAssoc INTEGER(4)
+   !DEF: /mm/OMPACCConstruct1/a (AccPrivate) HostAssoc INTEGER(4)
+   !REF: /mm/OMPACCConstruct1/i
+   !DEF: /mm/OMPACCConstruct1/b (AccFirstPrivate) HostAssoc INTEGER(4)
    a(i) = b(i)
   end do
  !$acc end parallel
Index: flang/test/Semantics/OpenMP/common-block.f90
===================================================================
--- flang/test/Semantics/OpenMP/common-block.f90
+++ flang/test/Semantics/OpenMP/common-block.f90
@@ -9,7 +9,7 @@
   integer :: b(2)
   common /blk/ a, b, c
   !$omp parallel private(/blk/)
-    !CHECK: OtherConstruct scope: size=0 alignment=1
+    !CHECK: OMPACCConstruct scope: size=0 alignment=1
     !CHECK:   a (OmpPrivate): HostAssoc
     !CHECK:   b (OmpPrivate): HostAssoc
     !CHECK:   c (OmpPrivate): HostAssoc
Index: flang/test/Semantics/OpenMP/default-clause.f90
===================================================================
--- flang/test/Semantics/OpenMP/default-clause.f90
+++ flang/test/Semantics/OpenMP/default-clause.f90
@@ -12,27 +12,27 @@
     !CHECK: z size=4 offset=8: ObjectEntity type: INTEGER(4)
     integer x, y, z, w, k, a 
     !$omp parallel  firstprivate(x) private(y) shared(w) default(private)
-        !CHECK: OtherConstruct scope: size=0 alignment=1
+        !CHECK: OMPACCConstruct scope: size=0 alignment=1
         !CHECK: a (OmpPrivate): HostAssoc
         !CHECK: k (OmpPrivate): HostAssoc
         !CHECK: x (OmpFirstPrivate): HostAssoc
         !CHECK: y (OmpPrivate): HostAssoc
         !CHECK: z (OmpPrivate): HostAssoc
         !$omp parallel default(private)
-            !CHECK: OtherConstruct scope: size=0 alignment=1
+            !CHECK: OMPACCConstruct scope: size=0 alignment=1
             !CHECK: a (OmpPrivate): HostAssoc
             !CHECK: x (OmpPrivate): HostAssoc
             !CHECK: y (OmpPrivate): HostAssoc
             y = 20
             x = 10
            !$omp parallel
-                !CHECK: OtherConstruct scope: size=0 alignment=1
+                !CHECK: OMPACCConstruct scope: size=0 alignment=1
                 a = 10
            !$omp end parallel
         !$omp end parallel 
 
         !$omp parallel default(firstprivate) shared(y) private(w)
-            !CHECK: OtherConstruct scope: size=0 alignment=1
+            !CHECK: OMPACCConstruct scope: size=0 alignment=1
             !CHECK: k (OmpFirstPrivate): HostAssoc
             !CHECK: w (OmpPrivate): HostAssoc
             !CHECK: z (OmpFirstPrivate): HostAssoc
Index: flang/test/Semantics/OpenMP/do-schedule03.f90
===================================================================
--- flang/test/Semantics/OpenMP/do-schedule03.f90
+++ flang/test/Semantics/OpenMP/do-schedule03.f90
@@ -15,11 +15,11 @@
   !REF: /ompdoschedule/b
   b = 10
   !$omp do  schedule(static,b-b)
-  !DEF: /ompdoschedule/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /ompdoschedule/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   !REF: /ompdoschedule/n
   do i = 2,n+1
     !REF: /ompdoschedule/y
-    !REF: /ompdoschedule/OtherConstruct1/i
+    !REF: /ompdoschedule/OMPACCConstruct1/i
     !REF: /ompdoschedule/z
     !REF: /ompdoschedule/a
     y(i) = z(i-1) + a(i)
Index: flang/test/Semantics/OpenMP/do-schedule04.f90
===================================================================
--- flang/test/Semantics/OpenMP/do-schedule04.f90
+++ flang/test/Semantics/OpenMP/do-schedule04.f90
@@ -20,10 +20,10 @@
   !REF: /tds/k
   k = 12
   !$omp do  schedule(static,j-k)
-  !DEF: /tds/OtherConstruct1/i (OmpPrivate,OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /tds/OMPACCConstruct1/i (OmpPrivate,OmpPreDetermined) HostAssoc INTEGER(4)
   do i = 1,10
     !REF: /tds/y
-    !REF: /tds/OtherConstruct1/i
+    !REF: /tds/OMPACCConstruct1/i
     !REF: /tds/z
     !REF: /tds/a
     y(i) = z(i-1)+a(i)
Index: flang/test/Semantics/OpenMP/do01-positivecase.f90
===================================================================
--- flang/test/Semantics/OpenMP/do01-positivecase.f90
+++ flang/test/Semantics/OpenMP/do01-positivecase.f90
@@ -10,7 +10,7 @@
   integer i
 
   !$omp do  firstprivate(k)
-  !DEF: /omp_do/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     print *, "Hello"
   end do
Index: flang/test/Semantics/OpenMP/do04-positivecase.f90
===================================================================
--- flang/test/Semantics/OpenMP/do04-positivecase.f90
+++ flang/test/Semantics/OpenMP/do04-positivecase.f90
@@ -11,7 +11,7 @@
   integer i, j, k, n
   !$omp threadprivate (k,n)
   !$omp do
-  !DEF: /omp_do1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do1/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_do1/j
     do j=1,10
Index: flang/test/Semantics/OpenMP/do05-positivecase.f90
===================================================================
--- flang/test/Semantics/OpenMP/do05-positivecase.f90
+++ flang/test/Semantics/OpenMP/do05-positivecase.f90
@@ -9,7 +9,7 @@
   !DEF: /omp_do/n ObjectEntity INTEGER(4)
   integer i,n
   !$omp parallel
-  !DEF: /omp_do/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !$omp single
     print *, "hello"
@@ -19,13 +19,13 @@
 
   !$omp parallel  default(shared)
   !$omp do
-  !DEF: /omp_do/OtherConstruct2/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do/OMPACCConstruct2/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   !REF: /omp_do/n
   do i=1,n
     !$omp parallel
     !$omp single
     !DEF: /work EXTERNAL (Subroutine) ProcEntity
-    !REF: /omp_do/OtherConstruct2/OtherConstruct1/i
+    !REF: /omp_do/OMPACCConstruct2/OMPACCConstruct1/i
     call work(i, 1)
     !$omp end single
     !$omp end parallel
Index: flang/test/Semantics/OpenMP/do06-positivecases.f90
===================================================================
--- flang/test/Semantics/OpenMP/do06-positivecases.f90
+++ flang/test/Semantics/OpenMP/do06-positivecases.f90
@@ -12,7 +12,7 @@
   !DEF: /omp_do/k ObjectEntity INTEGER(4)
   integer i, j, k
   !$omp do  ordered
-    !DEF: /omp_do/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_do/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do i=1,10
       !$omp ordered
       !DEF: /my_func EXTERNAL (Subroutine) ProcEntity
Index: flang/test/Semantics/OpenMP/do11.f90
===================================================================
--- flang/test/Semantics/OpenMP/do11.f90
+++ flang/test/Semantics/OpenMP/do11.f90
@@ -9,11 +9,11 @@
   !DEF: /omp_do/k ObjectEntity INTEGER(4)
   integer i, j, k
   !$omp do
-  !DEF: /omp_do/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_do/j
     do j=1,10
-      !REF: /omp_do/OtherConstruct1/i
+      !REF: /omp_do/OMPACCConstruct1/i
       !REF: /omp_do/j
       print *, "it", i, j
     end do
@@ -27,9 +27,9 @@
   !DEF: /omp_do2/k ObjectEntity INTEGER(4)
   integer :: i = 0, k
   !$omp do
-  !DEF: /omp_do2/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_do2/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !REF: /omp_do2/OtherConstruct1/i
+    !REF: /omp_do2/OMPACCConstruct1/i
     print *, "it", i
   end do
   !$omp end do
Index: flang/test/Semantics/OpenMP/do12.f90
===================================================================
--- flang/test/Semantics/OpenMP/do12.f90
+++ flang/test/Semantics/OpenMP/do12.f90
@@ -5,15 +5,15 @@
 !DEF: /omp_cycle MainProgram
 program omp_cycle
   !$omp do  collapse(1)
-  !DEF: /omp_cycle/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
-    !REF: /omp_cycle/OtherConstruct1/i
+    !REF: /omp_cycle/OMPACCConstruct1/i
     if (i<1) cycle
     !DEF: /omp_cycle/j (Implicit) ObjectEntity INTEGER(4)
     do j=0,10
       !DEF: /omp_cycle/k (Implicit) ObjectEntity INTEGER(4)
       do k=0,10
-        !REF: /omp_cycle/OtherConstruct1/i
+        !REF: /omp_cycle/OMPACCConstruct1/i
         !REF: /omp_cycle/j
         !REF: /omp_cycle/k
         print *, i, j, k
@@ -23,15 +23,15 @@
   !$omp end do
 
   !$omp do  collapse(1)
-  !DEF: /omp_cycle/OtherConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OMPACCConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
     !REF: /omp_cycle/j
     do j=0,10
-      !REF: /omp_cycle/OtherConstruct2/i
+      !REF: /omp_cycle/OMPACCConstruct2/i
       if (i<1) cycle
       !REF: /omp_cycle/k
       do k=0,10
-        !REF: /omp_cycle/OtherConstruct2/i
+        !REF: /omp_cycle/OMPACCConstruct2/i
         !REF: /omp_cycle/j
         !REF: /omp_cycle/k
         print *, i, j, k
@@ -41,16 +41,16 @@
   !$omp end do
 
   !$omp do  collapse(2)
-  !DEF: /omp_cycle/OtherConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OMPACCConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
-    !DEF: /omp_cycle/OtherConstruct3/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OMPACCConstruct3/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do j=0,10
       !REF: /omp_cycle/k
       do k=0,10
-        !REF: /omp_cycle/OtherConstruct3/i
+        !REF: /omp_cycle/OMPACCConstruct3/i
         if (i<1) cycle
-        !REF: /omp_cycle/OtherConstruct3/i
-        !REF: /omp_cycle/OtherConstruct3/j
+        !REF: /omp_cycle/OMPACCConstruct3/i
+        !REF: /omp_cycle/OMPACCConstruct3/j
         !REF: /omp_cycle/k
         print *, i, j, k
       end do
@@ -59,17 +59,17 @@
   !$omp end do
 
   !$omp do  collapse(3)
-  !DEF: /omp_cycle/OtherConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OMPACCConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
-    !DEF: /omp_cycle/OtherConstruct4/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OMPACCConstruct4/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do j=0,10
-      !DEF: /omp_cycle/OtherConstruct4/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+      !DEF: /omp_cycle/OMPACCConstruct4/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
       do k=0,10
-        !REF: /omp_cycle/OtherConstruct4/i
+        !REF: /omp_cycle/OMPACCConstruct4/i
         if (i<1) cycle
-        !REF: /omp_cycle/OtherConstruct4/i
-        !REF: /omp_cycle/OtherConstruct4/j
-        !REF: /omp_cycle/OtherConstruct4/k
+        !REF: /omp_cycle/OMPACCConstruct4/i
+        !REF: /omp_cycle/OMPACCConstruct4/j
+        !REF: /omp_cycle/OMPACCConstruct4/k
         print *, i, j, k
       end do
     end do
@@ -77,17 +77,17 @@
   !$omp end do
 
   !$omp do  collapse(3)
-  !DEF: /omp_cycle/OtherConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OMPACCConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   foo:do i=0,10
-    !DEF: /omp_cycle/OtherConstruct5/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OMPACCConstruct5/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     foo1:do j=0,10
-      !DEF: /omp_cycle/OtherConstruct5/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+      !DEF: /omp_cycle/OMPACCConstruct5/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
       foo2:do k=0,10
-        !REF: /omp_cycle/OtherConstruct5/i
+        !REF: /omp_cycle/OMPACCConstruct5/i
         if (i<1) cycle foo2
-        !REF: /omp_cycle/OtherConstruct5/i
-        !REF: /omp_cycle/OtherConstruct5/j
-        !REF: /omp_cycle/OtherConstruct5/k
+        !REF: /omp_cycle/OMPACCConstruct5/i
+        !REF: /omp_cycle/OMPACCConstruct5/j
+        !REF: /omp_cycle/OMPACCConstruct5/k
         print *, i, j, k
       end do foo2
     end do foo1
Index: flang/test/Semantics/OpenMP/do14.f90
===================================================================
--- flang/test/Semantics/OpenMP/do14.f90
+++ flang/test/Semantics/OpenMP/do14.f90
@@ -5,14 +5,14 @@
 !DEF: /omp_cycle MainProgram
 program omp_cycle
   !$omp do  collapse(1)
-  !DEF: /omp_cycle/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
     cycle
     !DEF: /omp_cycle/j (Implicit) ObjectEntity INTEGER(4)
     do j=0,10
       !DEF: /omp_cycle/k (Implicit) ObjectEntity INTEGER(4)
       do k=0,10
-        !REF: /omp_cycle/OtherConstruct1/i
+        !REF: /omp_cycle/OMPACCConstruct1/i
         !REF: /omp_cycle/j
         !REF: /omp_cycle/k
         print *, i, j, k
@@ -22,14 +22,14 @@
   !$omp end do
 
   !$omp do  collapse(1)
-  !DEF: /omp_cycle/OtherConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OMPACCConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
     !REF: /omp_cycle/j
     do j=0,10
       cycle
       !REF: /omp_cycle/k
       do k=0,10
-        !REF: /omp_cycle/OtherConstruct2/i
+        !REF: /omp_cycle/OMPACCConstruct2/i
         !REF: /omp_cycle/j
         !REF: /omp_cycle/k
         print *, i, j, k
@@ -39,15 +39,15 @@
   !$omp end do
 
   !$omp do  collapse(2)
-  !DEF: /omp_cycle/OtherConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OMPACCConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
-    !DEF: /omp_cycle/OtherConstruct3/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OMPACCConstruct3/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do j=0,10
       !REF: /omp_cycle/k
       do k=0,10
         cycle
-        !REF: /omp_cycle/OtherConstruct3/i
-        !REF: /omp_cycle/OtherConstruct3/j
+        !REF: /omp_cycle/OMPACCConstruct3/i
+        !REF: /omp_cycle/OMPACCConstruct3/j
         !REF: /omp_cycle/k
         print *, i, j, k
       end do
@@ -56,16 +56,16 @@
   !$omp end do
 
   !$omp do  collapse(3)
-  !DEF: /omp_cycle/OtherConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OMPACCConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=0,10
-    !DEF: /omp_cycle/OtherConstruct4/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OMPACCConstruct4/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do j=0,10
-      !DEF: /omp_cycle/OtherConstruct4/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+      !DEF: /omp_cycle/OMPACCConstruct4/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
       do k=0,10
         cycle
-        !REF: /omp_cycle/OtherConstruct4/i
-        !REF: /omp_cycle/OtherConstruct4/j
-        !REF: /omp_cycle/OtherConstruct4/k
+        !REF: /omp_cycle/OMPACCConstruct4/i
+        !REF: /omp_cycle/OMPACCConstruct4/j
+        !REF: /omp_cycle/OMPACCConstruct4/k
         print *, i, j, k
       end do
     end do
@@ -73,16 +73,16 @@
   !$omp end do
 
   !$omp do  ordered(3)
-  !DEF: /omp_cycle/OtherConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_cycle/OMPACCConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   foo:do i=0,10
-    !DEF: /omp_cycle/OtherConstruct5/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+    !DEF: /omp_cycle/OMPACCConstruct5/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     foo1:do j=0,10
-      !DEF: /omp_cycle/OtherConstruct5/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+      !DEF: /omp_cycle/OMPACCConstruct5/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
       foo2:do k=0,10
         cycle foo2
-        !REF: /omp_cycle/OtherConstruct5/i
-        !REF: /omp_cycle/OtherConstruct5/j
-        !REF: /omp_cycle/OtherConstruct5/k
+        !REF: /omp_cycle/OMPACCConstruct5/i
+        !REF: /omp_cycle/OMPACCConstruct5/j
+        !REF: /omp_cycle/OMPACCConstruct5/k
         print *, i, j, k
       end do foo2
     end do foo1
Index: flang/test/Semantics/OpenMP/do17.f90
===================================================================
--- flang/test/Semantics/OpenMP/do17.f90
+++ flang/test/Semantics/OpenMP/do17.f90
@@ -9,21 +9,21 @@
  !DEF: /test/k ObjectEntity INTEGER(4)
  integer i, j, k
  !$omp do  collapse(2)
- !DEF: /test/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  foo: do i=0,10
-  !DEF: /test/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test/OMPACCConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   foo1: do j=0,10
    !REF: /test/k
    foo2: do k=0,10
-    !REF: /test/OtherConstruct1/i
+    !REF: /test/OMPACCConstruct1/i
     select case (i)
     case (5)
      cycle foo1
     case (7)
      cycle foo2
     end select
-    !REF: /test/OtherConstruct1/i
-    !REF: /test/OtherConstruct1/j
+    !REF: /test/OMPACCConstruct1/i
+    !REF: /test/OMPACCConstruct1/j
     !REF: /test/k
     print *, i, j, k
    end do foo2
@@ -31,23 +31,23 @@
  end do foo
 
  !$omp do  collapse(2)
- !DEF: /test/OtherConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test/OMPACCConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  foo: do i=0,10
-  !DEF: /test/OtherConstruct2/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test/OMPACCConstruct2/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   foo1: do j=0,10
    !REF: /test/k
    foo2: do k=0,10
-    !REF: /test/OtherConstruct2/i
+    !REF: /test/OMPACCConstruct2/i
     if (i<3) then
      cycle foo1
-     !REF: /test/OtherConstruct2/i
+     !REF: /test/OMPACCConstruct2/i
     else if (i>8) then
      cycle foo1
     else
      cycle foo2
     end if
-    !REF: /test/OtherConstruct2/i
-    !REF: /test/OtherConstruct2/j
+    !REF: /test/OMPACCConstruct2/i
+    !REF: /test/OMPACCConstruct2/j
     !REF: /test/k
     print *, i, j, k
    end do foo2
Index: flang/test/Semantics/OpenMP/reduction08.f90
===================================================================
--- flang/test/Semantics/OpenMP/reduction08.f90
+++ flang/test/Semantics/OpenMP/reduction08.f90
@@ -11,9 +11,9 @@
   !DEF: /omp_reduction/m ObjectEntity INTEGER(4)
   integer :: m = 12
   !$omp parallel do  reduction(max:k)
-  !DEF: /omp_reduction/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/OtherConstruct1/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OMPACCConstruct1/k (OmpReduction) HostAssoc INTEGER(4)
     !DEF: /omp_reduction/max ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
     !REF: /omp_reduction/m
     k = max(k, m)
@@ -21,9 +21,9 @@
   !$omp end parallel do
 
   !$omp parallel do  reduction(min:k)
-  !DEF: /omp_reduction/OtherConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/OtherConstruct2/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OMPACCConstruct2/k (OmpReduction) HostAssoc INTEGER(4)
     !DEF: /omp_reduction/min ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
     !REF: /omp_reduction/m
     k = min(k, m)
@@ -31,9 +31,9 @@
   !$omp end parallel do
 
   !$omp parallel do  reduction(iand:k)
-  !DEF: /omp_reduction/OtherConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/OtherConstruct3/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OMPACCConstruct3/k (OmpReduction) HostAssoc INTEGER(4)
     !DEF: /omp_reduction/iand ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
     !REF: /omp_reduction/m
     k = iand(k, m)
@@ -41,9 +41,9 @@
   !$omp end parallel do
 
   !$omp parallel do  reduction(ior:k)
-  !DEF: /omp_reduction/OtherConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/OtherConstruct4/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OMPACCConstruct4/k (OmpReduction) HostAssoc INTEGER(4)
     !DEF: /omp_reduction/ior ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
     !REF: /omp_reduction/m
     k = ior(k, m)
@@ -51,9 +51,9 @@
   !$omp end parallel do
 
   !$omp parallel do  reduction(ieor:k)
-  !DEF: /omp_reduction/OtherConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/OtherConstruct5/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OMPACCConstruct5/k (OmpReduction) HostAssoc INTEGER(4)
     !DEF: /omp_reduction/ieor ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
     !REF: /omp_reduction/m
     k = ieor(k,m)
Index: flang/test/Semantics/OpenMP/reduction09.f90
===================================================================
--- flang/test/Semantics/OpenMP/reduction09.f90
+++ flang/test/Semantics/OpenMP/reduction09.f90
@@ -14,9 +14,9 @@
 
   !$omp parallel  shared(k)
   !$omp do  reduction(+:k)
-  !DEF: /omp_reduction/OtherConstruct1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct1/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/OtherConstruct1/OtherConstruct1/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OMPACCConstruct1/OMPACCConstruct1/k (OmpReduction) HostAssoc INTEGER(4)
     k = k+1
   end do
   !$omp end do
@@ -24,7 +24,7 @@
 
 
   !$omp parallel do  reduction(+:a(10))
-  !DEF: /omp_reduction/OtherConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct2/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_reduction/k
     k = k+1
@@ -33,7 +33,7 @@
 
 
   !$omp parallel do  reduction(+:a(1:10:1))
-  !DEF: /omp_reduction/OtherConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct3/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_reduction/k
     k = k+1
@@ -41,7 +41,7 @@
   !$omp end parallel do
 
   !$omp parallel do  reduction(+:b(1:10:1,1:5,2))
-  !DEF: /omp_reduction/OtherConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct4/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_reduction/k
     k = k+1
@@ -49,7 +49,7 @@
   !$omp end parallel do
 
   !$omp parallel do  reduction(+:b(1:10:1,1:5,2:5:1))
-  !DEF: /omp_reduction/OtherConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct5/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
     !REF: /omp_reduction/k
     k = k+1
@@ -58,27 +58,27 @@
 
   !$omp parallel  private(i)
   !$omp do reduction(+:k) reduction(+:j)
-  !DEF: /omp_reduction/OtherConstruct6/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct6/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/OtherConstruct6/OtherConstruct1/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OMPACCConstruct6/OMPACCConstruct1/k (OmpReduction) HostAssoc INTEGER(4)
     k = k+1
   end do
   !$omp end do
   !$omp end parallel
 
   !$omp do reduction(+:k) reduction(*:j) reduction(+:l)
-  !DEF: /omp_reduction/OtherConstruct7/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct7/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/OtherConstruct7/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OMPACCConstruct7/k (OmpReduction) HostAssoc INTEGER(4)
     k = k+1
   end do
   !$omp end do
 
 
   !$omp do reduction(.and.:k) reduction(.or.:j) reduction(.eqv.:l)
-  !DEF: /omp_reduction/OtherConstruct8/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /omp_reduction/OMPACCConstruct8/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-    !DEF: /omp_reduction/OtherConstruct8/k (OmpReduction) HostAssoc INTEGER(4)
+    !DEF: /omp_reduction/OMPACCConstruct8/k (OmpReduction) HostAssoc INTEGER(4)
     k = k+1
   end do
   !$omp end do
Index: flang/test/Semantics/OpenMP/symbol01.f90
===================================================================
--- flang/test/Semantics/OpenMP/symbol01.f90
+++ flang/test/Semantics/OpenMP/symbol01.f90
@@ -45,22 +45,22 @@
  !DEF: /mm/c (Implicit) ObjectEntity REAL(4)
  c = 2.0
 !$omp parallel do  private(a,t,/c/) shared(c)
- !DEF: /mm/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /mm/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,10
-  !DEF: /mm/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /mm/OMPACCConstruct1/a (OmpPrivate) HostAssoc REAL(4)
   !REF: /mm/b
-  !REF: /mm/OtherConstruct1/i
+  !REF: /mm/OMPACCConstruct1/i
   a = a+b(i)
-  !DEF: /mm/OtherConstruct1/t (OmpPrivate) HostAssoc TYPE(myty)
+  !DEF: /mm/OMPACCConstruct1/t (OmpPrivate) HostAssoc TYPE(myty)
   !REF: /md/myty/a
-  !REF: /mm/OtherConstruct1/i
+  !REF: /mm/OMPACCConstruct1/i
   t%a = i
-  !DEF: /mm/OtherConstruct1/y (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /mm/OMPACCConstruct1/y (OmpPrivate) HostAssoc REAL(4)
   y = 0.
-  !DEF: /mm/OtherConstruct1/x (OmpPrivate) HostAssoc REAL(4)
-  !REF: /mm/OtherConstruct1/a
-  !REF: /mm/OtherConstruct1/i
-  !REF: /mm/OtherConstruct1/y
+  !DEF: /mm/OMPACCConstruct1/x (OmpPrivate) HostAssoc REAL(4)
+  !REF: /mm/OMPACCConstruct1/a
+  !REF: /mm/OMPACCConstruct1/i
+  !REF: /mm/OMPACCConstruct1/y
   x = a+i+y
   !REF: /mm/c
   c = 3.0
Index: flang/test/Semantics/OpenMP/symbol02.f90
===================================================================
--- flang/test/Semantics/OpenMP/symbol02.f90
+++ flang/test/Semantics/OpenMP/symbol02.f90
@@ -11,9 +11,9 @@
   !DEF: /MainProgram1/c (Implicit) ObjectEntity REAL(4)
   c = 0
   !$omp parallel  private(a,b) shared(c,d)
-  !DEF: /MainProgram1/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /MainProgram1/OMPACCConstruct1/a (OmpPrivate) HostAssoc REAL(4)
   a = 3.
-  !DEF: /MainProgram1/OtherConstruct1/b (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /MainProgram1/OMPACCConstruct1/b (OmpPrivate) HostAssoc REAL(4)
   b = 4
   !REF: /MainProgram1/c
   c = 5
Index: flang/test/Semantics/OpenMP/symbol03.f90
===================================================================
--- flang/test/Semantics/OpenMP/symbol03.f90
+++ flang/test/Semantics/OpenMP/symbol03.f90
@@ -7,14 +7,14 @@
   !DEF: /MainProgram1/b (Implicit) ObjectEntity REAL(4)
   b = 2
   !$omp parallel  private(a) shared(b)
-  !DEF: /MainProgram1/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /MainProgram1/OMPACCConstruct1/a (OmpPrivate) HostAssoc REAL(4)
   a = 3.
   !REF: /MainProgram1/b
   b = 4
   !$omp parallel  private(b) shared(a)
-  !REF: /MainProgram1/OtherConstruct1/a
+  !REF: /MainProgram1/OMPACCConstruct1/a
   a = 5.
-  !DEF: /MainProgram1/OtherConstruct1/OtherConstruct1/b (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /MainProgram1/OMPACCConstruct1/OMPACCConstruct1/b (OmpPrivate) HostAssoc REAL(4)
   b = 6
   !$omp end parallel
   !$omp end parallel
Index: flang/test/Semantics/OpenMP/symbol04.f90
===================================================================
--- flang/test/Semantics/OpenMP/symbol04.f90
+++ flang/test/Semantics/OpenMP/symbol04.f90
@@ -9,12 +9,12 @@
   !REF: /MainProgram1/a
   a = 3.14
   !$omp parallel  private(a)
-  !DEF: /MainProgram1/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(8)
+  !DEF: /MainProgram1/OMPACCConstruct1/a (OmpPrivate) HostAssoc REAL(8)
   a = 2.
   !$omp do  private(a)
-  !DEF: /MainProgram1/OtherConstruct1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /MainProgram1/OMPACCConstruct1/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-     !DEF: /MainProgram1/OtherConstruct1/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(8)
+     !DEF: /MainProgram1/OMPACCConstruct1/OMPACCConstruct1/a (OmpPrivate) HostAssoc REAL(8)
      a = 1.
   end do
   !$omp end parallel
Index: flang/test/Semantics/OpenMP/symbol06.f90
===================================================================
--- flang/test/Semantics/OpenMP/symbol06.f90
+++ flang/test/Semantics/OpenMP/symbol06.f90
@@ -8,9 +8,9 @@
   !DEF: /MainProgram1/a (Implicit) ObjectEntity REAL(4)
   a = 1.
   !$omp parallel do  firstprivate(a) lastprivate(a)
-  !DEF: /MainProgram1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /MainProgram1/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-     !DEF: /MainProgram1/OtherConstruct1/a (OmpFirstPrivate, OmpLastPrivate) HostAssoc REAL(4)
+     !DEF: /MainProgram1/OMPACCConstruct1/a (OmpFirstPrivate, OmpLastPrivate) HostAssoc REAL(4)
      a = 2.
   end do
 end program
Index: flang/test/Semantics/OpenMP/symbol07.f90
===================================================================
--- flang/test/Semantics/OpenMP/symbol07.f90
+++ flang/test/Semantics/OpenMP/symbol07.f90
@@ -21,7 +21,7 @@
   !DEF: /function_call_in_region/b ObjectEntity REAL(4)
   real :: b = 5.
   !$omp parallel  default(none) private(a) shared(b)
-  !DEF: /function_call_in_region/OtherConstruct1/a (OmpPrivate) HostAssoc REAL(4)
+  !DEF: /function_call_in_region/OMPACCConstruct1/a (OmpPrivate) HostAssoc REAL(4)
   !REF: /function_call_in_region/foo
   !REF: /function_call_in_region/b
   a = foo(b)
Index: flang/test/Semantics/OpenMP/symbol08.f90
===================================================================
--- flang/test/Semantics/OpenMP/symbol08.f90
+++ flang/test/Semantics/OpenMP/symbol08.f90
@@ -31,18 +31,18 @@
  !REF: /test_do/i
  i = 99
 !$omp do  collapse(2)
- !DEF: /test_do/OtherConstruct1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test_do/OMPACCConstruct1/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,5
-  !DEF: /test_do/OtherConstruct1/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test_do/OMPACCConstruct1/OMPACCConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do j=6,10
    !REF: /test_do/a
    a(1,1,1) = 0.
-   !DEF: /test_do/OtherConstruct1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+   !DEF: /test_do/OMPACCConstruct1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
    do k=11,15
     !REF: /test_do/a
-    !REF: /test_do/OtherConstruct1/k
-    !REF: /test_do/OtherConstruct1/OtherConstruct1/j
-    !REF: /test_do/OtherConstruct1/OtherConstruct1/i
+    !REF: /test_do/OMPACCConstruct1/k
+    !REF: /test_do/OMPACCConstruct1/OMPACCConstruct1/j
+    !REF: /test_do/OMPACCConstruct1/OMPACCConstruct1/i
     a(k,j,i) = 1.
    end do
   end do
@@ -61,18 +61,18 @@
  !DEF: /test_pardo/k ObjectEntity INTEGER(4)
  integer i, j, k
 !$omp parallel do  collapse(2) private(k) ordered(2)
- !DEF: /test_pardo/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test_pardo/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,5
-   !DEF: /test_pardo/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+   !DEF: /test_pardo/OMPACCConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
     do j=6,10
    !REF: /test_pardo/a
    a(1,1,1) = 0.
-   !DEF: /test_pardo/OtherConstruct1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+   !DEF: /test_pardo/OMPACCConstruct1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
    do k=11,15
     !REF: /test_pardo/a
-    !REF: /test_pardo/OtherConstruct1/k
-    !REF: /test_pardo/OtherConstruct1/j
-    !REF: /test_pardo/OtherConstruct1/i
+    !REF: /test_pardo/OMPACCConstruct1/k
+    !REF: /test_pardo/OMPACCConstruct1/j
+    !REF: /test_pardo/OMPACCConstruct1/i
     a(k,j,i) = 1.
    end do
   end do
@@ -89,14 +89,14 @@
  !DEF: /test_taskloop/j ObjectEntity INTEGER(4)
  integer i, j
 !$omp taskloop  private(j)
- !DEF: /test_taskloop/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test_taskloop/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,5
-  !DEF: /test_taskloop/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
-  !REF: /test_taskloop/OtherConstruct1/i
+  !DEF: /test_taskloop/OMPACCConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !REF: /test_taskloop/OMPACCConstruct1/i
   do j=1,i
    !REF: /test_taskloop/a
-   !REF: /test_taskloop/OtherConstruct1/j
-   !REF: /test_taskloop/OtherConstruct1/i
+   !REF: /test_taskloop/OMPACCConstruct1/j
+   !REF: /test_taskloop/OMPACCConstruct1/i
    a(j,i) = 3.14
   end do
  end do
@@ -132,20 +132,20 @@
 !$omp target  map(to:b,c)  map(tofrom:sum)
 !$omp teams  num_teams(num_teams) thread_limit(block_threads) reduction(+:sum)
 !$omp distribute
- !DEF: /dotprod/OtherConstruct1/OtherConstruct1/OtherConstruct1/i0 (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /dotprod/OMPACCConstruct1/OMPACCConstruct1/OMPACCConstruct1/i0 (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  !REF: /dotprod/n
  !REF: /dotprod/block_size
  do i0=1,n,block_size
 !$omp parallel do  reduction(+:sum)
-  !DEF: /dotprod/OtherConstruct1/OtherConstruct1/OtherConstruct1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
-  !REF: /dotprod/OtherConstruct1/OtherConstruct1/OtherConstruct1/i0
+  !DEF: /dotprod/OMPACCConstruct1/OMPACCConstruct1/OMPACCConstruct1/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !REF: /dotprod/OMPACCConstruct1/OMPACCConstruct1/OMPACCConstruct1/i0
   !DEF: /dotprod/min ELEMENTAL, INTRINSIC, PURE (Function) ProcEntity
   !REF: /dotprod/block_size
   !REF: /dotprod/n
   do i=i0,min(i0+block_size, n)
-   !DEF: /dotprod/OtherConstruct1/OtherConstruct1/OtherConstruct1/OtherConstruct1/sum (OmpReduction) HostAssoc REAL(4)
+   !DEF: /dotprod/OMPACCConstruct1/OMPACCConstruct1/OMPACCConstruct1/OMPACCConstruct1/sum (OmpReduction) HostAssoc REAL(4)
    !REF: /dotprod/b
-   !REF: /dotprod/OtherConstruct1/OtherConstruct1/OtherConstruct1/OtherConstruct1/i
+   !REF: /dotprod/OMPACCConstruct1/OMPACCConstruct1/OMPACCConstruct1/OMPACCConstruct1/i
    !REF: /dotprod/c
    sum = sum+b(i)*c(i)
   end do
@@ -168,16 +168,16 @@
  !DEF: /test_simd/k ObjectEntity INTEGER(4)
  integer i, j, k
 !$omp parallel do simd
- !DEF: /test_simd/OtherConstruct1/i (OmpLinear, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test_simd/OMPACCConstruct1/i (OmpLinear, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,5
-  !DEF: /test_simd/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test_simd/OMPACCConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do j=6,10
-   !DEF: /test_simd/OtherConstruct1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+   !DEF: /test_simd/OMPACCConstruct1/k (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
    do k=11,15
     !REF: /test_simd/a
-    !REF: /test_simd/OtherConstruct1/k
-    !REF: /test_simd/OtherConstruct1/j
-    !REF: /test_simd/OtherConstruct1/i
+    !REF: /test_simd/OMPACCConstruct1/k
+    !REF: /test_simd/OMPACCConstruct1/j
+    !REF: /test_simd/OMPACCConstruct1/i
     a(k,j,i) = 3.14
    end do
   end do
@@ -195,16 +195,16 @@
  !DEF: /test_simd_multi/k ObjectEntity INTEGER(4)
  integer i, j, k
 !$omp parallel do simd  collapse(3)
- !DEF: /test_simd_multi/OtherConstruct1/i (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+ !DEF: /test_simd_multi/OMPACCConstruct1/i (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
  do i=1,5
-  !DEF: /test_simd_multi/OtherConstruct1/j (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test_simd_multi/OMPACCConstruct1/j (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do j=6,10
-   !DEF: /test_simd_multi/OtherConstruct1/k (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+   !DEF: /test_simd_multi/OMPACCConstruct1/k (OmpLastPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
    do k=11,15
     !REF: /test_simd_multi/a
-    !REF: /test_simd_multi/OtherConstruct1/k
-    !REF: /test_simd_multi/OtherConstruct1/j
-    !REF: /test_simd_multi/OtherConstruct1/i
+    !REF: /test_simd_multi/OMPACCConstruct1/k
+    !REF: /test_simd_multi/OMPACCConstruct1/j
+    !REF: /test_simd_multi/OMPACCConstruct1/i
     a(k,j,i) = 3.14
    end do
   end do
@@ -228,17 +228,17 @@
   print *, i, j
   !$omp parallel
   !REF: /test_seq_loop/i
-  !DEF: /test_seq_loop/OtherConstruct1/OtherConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test_seq_loop/OMPACCConstruct1/OMPACCConstruct1/j (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   print *, i, j
   !$omp do
-  !DEF: /test_seq_loop/OtherConstruct1/OtherConstruct1/OtherConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
+  !DEF: /test_seq_loop/OMPACCConstruct1/OMPACCConstruct1/OMPACCConstruct1/i (OmpPrivate, OmpPreDetermined) HostAssoc INTEGER(4)
   do i=1,10
-   !REF: /test_seq_loop/OtherConstruct1/OtherConstruct1/j
+   !REF: /test_seq_loop/OMPACCConstruct1/OMPACCConstruct1/j
    do j=1,10
    end do
   end do
   !REF: /test_seq_loop/i
-  !REF: /test_seq_loop/OtherConstruct1/OtherConstruct1/j
+  !REF: /test_seq_loop/OMPACCConstruct1/OMPACCConstruct1/j
   print *, i, j
   !$omp end parallel
   !REF: /test_seq_loop/i