diff --git a/flang/examples/CMakeLists.txt b/flang/examples/CMakeLists.txt
--- a/flang/examples/CMakeLists.txt
+++ b/flang/examples/CMakeLists.txt
@@ -12,4 +12,4 @@
 )
 
 add_subdirectory(PrintFlangFunctionNames)
-add_subdirectory(flang-omp-report-plugin)
+add_subdirectory(FlangOmpReport)
diff --git a/flang/examples/FlangOmpReport/CMakeLists.txt b/flang/examples/FlangOmpReport/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/flang/examples/FlangOmpReport/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_llvm_library(flangOmpReport
+  MODULE
+  FlangOmpReport.cpp
+  FlangOmpReportVisitor.cpp
+
+  DEPENDS
+  acc_gen
+)
diff --git a/flang/examples/flang-omp-report-plugin/flang-omp-report.cpp b/flang/examples/FlangOmpReport/FlangOmpReport.cpp
rename from flang/examples/flang-omp-report-plugin/flang-omp-report.cpp
rename to flang/examples/FlangOmpReport/FlangOmpReport.cpp
--- a/flang/examples/flang-omp-report-plugin/flang-omp-report.cpp
+++ b/flang/examples/FlangOmpReport/FlangOmpReport.cpp
@@ -15,7 +15,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang-omp-report-visitor.h"
+#include "FlangOmpReportVisitor.h"
 
 #include "flang/Frontend/CompilerInstance.h"
 #include "flang/Frontend/FrontendActions.h"
diff --git a/flang/examples/flang-omp-report-plugin/flang-omp-report-visitor.h b/flang/examples/FlangOmpReport/FlangOmpReportVisitor.h
rename from flang/examples/flang-omp-report-plugin/flang-omp-report-visitor.h
rename to flang/examples/FlangOmpReport/FlangOmpReportVisitor.h
diff --git a/flang/examples/flang-omp-report-plugin/flang-omp-report-visitor.cpp b/flang/examples/FlangOmpReport/FlangOmpReportVisitor.cpp
rename from flang/examples/flang-omp-report-plugin/flang-omp-report-visitor.cpp
rename to flang/examples/FlangOmpReport/FlangOmpReportVisitor.cpp
--- a/flang/examples/flang-omp-report-plugin/flang-omp-report-visitor.cpp
+++ b/flang/examples/FlangOmpReport/FlangOmpReportVisitor.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "flang-omp-report-visitor.h"
+#include "FlangOmpReportVisitor.h"
 #include "llvm/ADT/StringExtras.h"
 
 namespace Fortran {
diff --git a/flang/examples/flang-omp-report-plugin/requirements.txt b/flang/examples/FlangOmpReport/requirements.txt
rename from flang/examples/flang-omp-report-plugin/requirements.txt
rename to flang/examples/FlangOmpReport/requirements.txt
diff --git a/flang/examples/flang-omp-report-plugin/yaml_summarizer.py b/flang/examples/FlangOmpReport/yaml_summarizer.py
rename from flang/examples/flang-omp-report-plugin/yaml_summarizer.py
rename to flang/examples/FlangOmpReport/yaml_summarizer.py
diff --git a/flang/examples/PrintFlangFunctionNames/CMakeLists.txt b/flang/examples/PrintFlangFunctionNames/CMakeLists.txt
--- a/flang/examples/PrintFlangFunctionNames/CMakeLists.txt
+++ b/flang/examples/PrintFlangFunctionNames/CMakeLists.txt
@@ -1,7 +1,9 @@
 # TODO: Note that this is currently only available on Linux.
 # On Windows, we would also have to specify e.g. `PLUGIN_TOOL`.
-add_llvm_library(
-    flangPrintFunctionNames
+add_llvm_library(flangPrintFunctionNames
     MODULE
     PrintFlangFunctionNames.cpp
+
+    DEPENDS
+    acc_gen
 )
diff --git a/flang/examples/flang-omp-report-plugin/CMakeLists.txt b/flang/examples/flang-omp-report-plugin/CMakeLists.txt
deleted file mode 100644
--- a/flang/examples/flang-omp-report-plugin/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-add_llvm_library(
-  flangOmpReport
-  MODULE
-  flang-omp-report.cpp
-  flang-omp-report-visitor.cpp
-)