From 4dff7d9e63f1a762c44a62e477bf5ec095b19fba Mon Sep 17 00:00:00 2001
From: Will Browne <will.browne@grafana.com>
Date: Fri, 7 Mar 2025 17:41:42 +0000
Subject: [PATCH] add missing

---
 .../.config/docker-compose-base.yaml           | 10 +++++-----
 .../.config/supervisord/supervisord.conf       |  8 ++++----
 examples/app-with-rbac/README.md               | 18 +++++++++---------
 examples/app-with-rbac/docker-compose.yaml     |  4 ++--
 examples/app-with-rbac/package-lock.json       |  4 ++--
 examples/app-with-rbac/package.json            |  2 +-
 examples/app-with-rbac/pkg/main.go             |  2 +-
 examples/app-with-rbac/pkg/plugin/app.go       |  4 ++--
 examples/app-with-rbac/pkg/plugin/resources.go |  4 ++--
 .../app-with-rbac/pkg/plugin/resources_test.go |  8 ++++----
 .../provisioning/plugins/apps.yaml             |  2 +-
 .../app-with-rbac/src/components/App/App.tsx   |  4 ++--
 examples/app-with-rbac/src/pages/Hello.tsx     |  4 ++--
 examples/app-with-rbac/src/pages/Patents.tsx   |  4 ++--
 .../app-with-rbac/src/pages/ResearchDocs.tsx   |  4 ++--
 examples/app-with-rbac/src/plugin.json         | 14 +++++++-------
 .../.config/docker-compose-base.yaml           | 10 +++++-----
 .../.config/supervisord/supervisord.conf       |  8 ++++----
 .../docker-compose.yaml                        |  4 ++--
 examples/app-with-service-account/pkg/main.go  |  2 +-
 .../provisioning/plugins/apps.yaml             |  2 +-
 .../src/pages/PageOne.tsx                      |  4 ++--
 .../app-with-service-account/src/plugin.json   |  2 +-
 .../.config/docker-compose-base.yaml           | 10 +++++-----
 .../.config/supervisord/supervisord.conf       |  8 ++++----
 examples/datasource-basic/pkg/main.go          |  4 ++--
 .../provisioning/dashboards/dashboard.json     |  8 ++++----
 .../provisioning/datasources/datasources.yml   |  2 +-
 examples/datasource-basic/src/plugin.json      |  4 ++--
 .../datasource-http-backend/src/plugin.json    |  2 +-
 .../.config/docker-compose-base.yaml           | 10 +++++-----
 examples/datasource-http/package-lock.json     |  4 ++--
 examples/datasource-http/package.json          |  2 +-
 .../provisioning/datasources/datasources.yml   |  2 +-
 examples/datasource-http/src/plugin.json       |  4 ++--
 .../.config/docker-compose-base.yaml           | 10 +++++-----
 examples/datasource-logs/package-lock.json     |  4 ++--
 examples/datasource-logs/package.json          |  2 +-
 .../provisioning/datasources/datasources.yml   |  2 +-
 examples/datasource-logs/src/plugin.json       |  4 ++--
 .../.config/docker-compose-base.yaml           | 10 +++++-----
 .../docker-compose.yaml                        |  4 ++--
 .../package-lock.json                          |  4 ++--
 .../streaming-websocket-plugin/package.json    |  2 +-
 .../provisioning/datasources/datasources.yml   |  2 +-
 .../streaming-websocket-plugin/src/plugin.json |  2 +-
 .../.config/docker-compose-base.yaml           | 10 +++++-----
 examples/panel-basic/docker-compose.yaml       |  4 ++--
 examples/panel-basic/package-lock.json         |  4 ++--
 examples/panel-basic/package.json              |  2 +-
 .../provisioning/dashboards/panels.json        |  4 ++--
 examples/panel-basic/src/plugin.json           |  6 +++---
 .../.config/docker-compose-base.yaml           | 10 +++++-----
 examples/panel-frame-select/package-lock.json  |  4 ++--
 examples/panel-frame-select/package.json       |  2 +-
 .../provisioning/dashboards/panels.json        |  6 +++---
 examples/panel-frame-select/src/plugin.json    |  4 ++--
 57 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/examples/app-with-rbac/.config/docker-compose-base.yaml b/examples/app-with-rbac/.config/docker-compose-base.yaml
index dce554ec8..041b60484 100644
--- a/examples/app-with-rbac/.config/docker-compose-base.yaml
+++ b/examples/app-with-rbac/.config/docker-compose-base.yaml
@@ -1,7 +1,7 @@
 services:
   grafana:
     user: root
-    container_name: 'grafana-appwithrbac-app'
+    container_name: 'myorg-appwithrbac-app'
 
     build:
       context: .
@@ -19,13 +19,13 @@ services:
     cap_add:
       - SYS_PTRACE
     volumes:
-      - ../dist:/var/lib/grafana/plugins/grafana-appwithrbac-app
+      - ../dist:/var/lib/grafana/plugins/myorg-appwithrbac-app
       - ../provisioning:/etc/grafana/provisioning
-      - ..:/root/grafana-appwithrbac-app
+      - ..:/root/myorg-appwithrbac-app
 
     environment:
       NODE_ENV: development
-      GF_LOG_FILTERS: plugin.grafana-appwithrbac-app:debug
+      GF_LOG_FILTERS: plugin.myorg-appwithrbac-app:debug
       GF_LOG_LEVEL: debug
       GF_DATAPROXY_LOGGING: 1
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-appwithrbac-app
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: myorg-appwithrbac-app
diff --git a/examples/app-with-rbac/.config/supervisord/supervisord.conf b/examples/app-with-rbac/.config/supervisord/supervisord.conf
index 2e2426af0..0b7bfd4a7 100644
--- a/examples/app-with-rbac/.config/supervisord/supervisord.conf
+++ b/examples/app-with-rbac/.config/supervisord/supervisord.conf
@@ -5,7 +5,7 @@ user=root
 [program:grafana]
 user=root
 directory=/var/lib/grafana
-command=bash -c 'while [ ! -f /root/grafana-appwithrbac-app/dist/gpx_grafana_appwithrbac_app* ]; do sleep 1; done; /run.sh'
+command=bash -c 'while [ ! -f /root/myorg-appwithrbac-app/dist/gpx_grafana_appwithrbac_app* ]; do sleep 1; done; /run.sh'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
@@ -26,7 +26,7 @@ autorestart=true
 
 [program:build-watcher]
 user=root
-command=/bin/bash -c 'while inotifywait -e modify,create,delete -r /var/lib/grafana/plugins/grafana-appwithrbac-app; do echo "Change detected, restarting delve...";supervisorctl restart delve; done'
+command=/bin/bash -c 'while inotifywait -e modify,create,delete -r /var/lib/grafana/plugins/myorg-appwithrbac-app; do echo "Change detected, restarting delve...";supervisorctl restart delve; done'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
@@ -37,8 +37,8 @@ autostart=true
 [program:mage-watcher]
 user=root
 environment=PATH="/usr/local/go/bin:/root/go/bin:%(ENV_PATH)s"
-directory=/root/grafana-appwithrbac-app
-command=/bin/bash -c 'git config --global --add safe.directory /root/grafana-appwithrbac-app && mage -v watch'
+directory=/root/myorg-appwithrbac-app
+command=/bin/bash -c 'git config --global --add safe.directory /root/myorg-appwithrbac-app && mage -v watch'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
diff --git a/examples/app-with-rbac/README.md b/examples/app-with-rbac/README.md
index 32b4ce33d..f2ac81401 100644
--- a/examples/app-with-rbac/README.md
+++ b/examples/app-with-rbac/README.md
@@ -30,7 +30,7 @@ To define roles, add a `roles` section to the `plugin.json` file. Here is an exa
       "name": "Patents Reader",
       "description": "Read patents",
       "permissions": [
-        {"action": "grafana-appwithrbac-app.patents:read"}
+        {"action": "myorg-appwithrbac-app.patents:read"}
       ]
     },
     "grants": ["Admin"]
@@ -40,7 +40,7 @@ To define roles, add a `roles` section to the `plugin.json` file. Here is an exa
       "name": "Research papers Reader",
       "description": "Read research papers",
       "permissions": [
-        {"action": "grafana-appwithrbac-app.papers:read"}
+        {"action": "myorg-appwithrbac-app.papers:read"}
       ]
     },
     "grants": ["Viewer"]
@@ -58,7 +58,7 @@ To protect your frontend pages behind an action check, add `action` to the inclu
     "type": "page",
     "name": "Research documents",
     "path": "/a/%PLUGIN_ID%/research-docs",
-    "action": "grafana-appwithrbac-app.papers:read",
+    "action": "myorg-appwithrbac-app.papers:read",
     "addToNav": true,
     "defaultNav": false
   },
@@ -66,7 +66,7 @@ To protect your frontend pages behind an action check, add `action` to the inclu
     "type": "page",
     "name": "Patents",
     "path": "/a/%PLUGIN_ID%/patents",
-    "action": "grafana-appwithrbac-app.patents:read",
+    "action": "myorg-appwithrbac-app.patents:read",
     "addToNav": true,
     "defaultNav": false
   }
@@ -82,7 +82,7 @@ If you want to protect your proxied routes behind an action check, add `reqActio
   {
     "path": "api/external/patents",
     "method": "*",
-    "reqAction": "grafana-appwithrbac-app.patents:read",
+    "reqAction": "myorg-appwithrbac-app.patents:read",
     "url": "{{ .JsonData.backendUrl }}/api/external/patents",
     "headers": [
       {
@@ -167,8 +167,8 @@ func (a *App) GetAuthZClient(req *http.Request) (authz.EnforcementClient, error)
 		// Grafana is signing the JWTs on local setups
 		JWKsURL: strings.TrimRight(grafanaURL, "/") + "/api/signing-keys/keys",
 	},
-		// Fetch all the user permission prefixed with grafana-appwithrbac-app
-		authz.WithSearchByPrefix("grafana-appwithrbac-app"),
+		// Fetch all the user permission prefixed with myorg-appwithrbac-app
+		authz.WithSearchByPrefix("myorg-appwithrbac-app"),
 		// Use a cache with a lower expiry time
 		authz.WithCache(cache.NewLocalCache(cache.Config{
 			Expiry:          10 * time.Second,
@@ -215,7 +215,7 @@ func (a *App) HasAccess(req *http.Request, action string) (bool, error) {
 ```
 
 ```go
-if hasAccess, err := a.HasAccess(req, "grafana-appwithrbac-app.patents:read"); err != nil || !hasAccess {
+if hasAccess, err := a.HasAccess(req, "myorg-appwithrbac-app.patents:read"); err != nil || !hasAccess {
   if err != nil {
     log.DefaultLogger.FromContext(req.Context()).Error("Error checking access", "error", err)
   }
@@ -238,7 +238,7 @@ import { contextSrv } from 'grafana/app/core/core';
 Then checks can be performed as follow:
 
 ```ts
-if (contextSrv.hasPermission('grafana-appwithrbac-app.papers:read')) {
+if (contextSrv.hasPermission('myorg-appwithrbac-app.papers:read')) {
   // Example: register route, display link etc...
 }
 ```
diff --git a/examples/app-with-rbac/docker-compose.yaml b/examples/app-with-rbac/docker-compose.yaml
index a4828f310..4ea885547 100644
--- a/examples/app-with-rbac/docker-compose.yaml
+++ b/examples/app-with-rbac/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.0'
 
 services:
   grafana:
-    container_name: 'grafana-appwithrbac-app'
+    container_name: 'myorg-appwithrbac-app'
     platform: 'linux/amd64'
     build:
       context: ./.config
@@ -14,5 +14,5 @@ services:
     ports:
       - 3000:3000/tcp
     volumes:
-      - ./dist:/var/lib/grafana/plugins/grafana-appwithrbac-app
+      - ./dist:/var/lib/grafana/plugins/myorg-appwithrbac-app
       - ./provisioning:/etc/grafana/provisioning
diff --git a/examples/app-with-rbac/package-lock.json b/examples/app-with-rbac/package-lock.json
index 75649f0a4..975804a22 100644
--- a/examples/app-with-rbac/package-lock.json
+++ b/examples/app-with-rbac/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "grafana-appwithrbac-app",
+  "name": "myorg-appwithrbac-app",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "grafana-appwithrbac-app",
+      "name": "myorg-appwithrbac-app",
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/examples/app-with-rbac/package.json b/examples/app-with-rbac/package.json
index 1697ba581..cbf644ae7 100644
--- a/examples/app-with-rbac/package.json
+++ b/examples/app-with-rbac/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "grafana-appwithrbac-app",
+  "name": "myorg-appwithrbac-app",
   "version": "1.0.0",
   "description": "A basic grafana app plugin defining its own permissions",
   "scripts": {
diff --git a/examples/app-with-rbac/pkg/main.go b/examples/app-with-rbac/pkg/main.go
index 8de01869e..73ac3dbb0 100644
--- a/examples/app-with-rbac/pkg/main.go
+++ b/examples/app-with-rbac/pkg/main.go
@@ -16,7 +16,7 @@ func main() {
 	// argument. This factory will be automatically called on incoming request
 	// from Grafana to create different instances of `App` (per plugin
 	// ID).
-	if err := app.Manage("grafana-appwithrbac-app", plugin.NewApp, app.ManageOpts{}); err != nil {
+	if err := app.Manage("myorg-appwithrbac-app", plugin.NewApp, app.ManageOpts{}); err != nil {
 		log.DefaultLogger.Error(err.Error())
 		os.Exit(1)
 	}
diff --git a/examples/app-with-rbac/pkg/plugin/app.go b/examples/app-with-rbac/pkg/plugin/app.go
index f8bdd31a0..49a67dadc 100644
--- a/examples/app-with-rbac/pkg/plugin/app.go
+++ b/examples/app-with-rbac/pkg/plugin/app.go
@@ -101,8 +101,8 @@ func (a *App) GetAuthZClient(req *http.Request) (authz.EnforcementClient, error)
 		// Grafana is signing the JWTs on local setups
 		JWKsURL: strings.TrimRight(grafanaURL, "/") + "/api/signing-keys/keys",
 	},
-		// Fetch all the user permission prefixed with grafana-appwithrbac-app
-		authz.WithSearchByPrefix("grafana-appwithrbac-app"),
+		// Fetch all the user permission prefixed with myorg-appwithrbac-app
+		authz.WithSearchByPrefix("myorg-appwithrbac-app"),
 		// Use a cache with a lower expiry time
 		authz.WithCache(cache.NewLocalCache(cache.Config{
 			Expiry:          10 * time.Second,
diff --git a/examples/app-with-rbac/pkg/plugin/resources.go b/examples/app-with-rbac/pkg/plugin/resources.go
index f15953eb5..c3c904546 100644
--- a/examples/app-with-rbac/pkg/plugin/resources.go
+++ b/examples/app-with-rbac/pkg/plugin/resources.go
@@ -50,7 +50,7 @@ func (a *App) handlePapers(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	if hasAccess, err := a.HasAccess(req, "grafana-appwithrbac-app.papers:read"); err != nil || !hasAccess {
+	if hasAccess, err := a.HasAccess(req, "myorg-appwithrbac-app.papers:read"); err != nil || !hasAccess {
 		DenyAccess(w, ctxLogger, err)
 		return
 	}
@@ -111,7 +111,7 @@ func (a *App) handlePatents(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	if hasAccess, err := a.HasAccess(req, "grafana-appwithrbac-app.patents:read"); err != nil || !hasAccess {
+	if hasAccess, err := a.HasAccess(req, "myorg-appwithrbac-app.patents:read"); err != nil || !hasAccess {
 		DenyAccess(w, ctxLogger, err)
 		return
 	}
diff --git a/examples/app-with-rbac/pkg/plugin/resources_test.go b/examples/app-with-rbac/pkg/plugin/resources_test.go
index a1cbdf36d..ffd35d781 100644
--- a/examples/app-with-rbac/pkg/plugin/resources_test.go
+++ b/examples/app-with-rbac/pkg/plugin/resources_test.go
@@ -82,7 +82,7 @@ func TestCallResource(t *testing.T) {
 			method: http.MethodGet,
 			path:   "papers",
 			init: func(t *testing.T, m *mockAuthZClient) {
-				m.On("HasAccess", mock.Anything, "FakeId", "grafana-appwithrbac-app.papers:read", mock.Anything).Return(true, nil)
+				m.On("HasAccess", mock.Anything, "FakeId", "myorg-appwithrbac-app.papers:read", mock.Anything).Return(true, nil)
 			},
 			expStatus: http.StatusOK,
 		},
@@ -91,7 +91,7 @@ func TestCallResource(t *testing.T) {
 			method: http.MethodGet,
 			path:   "patents",
 			init: func(t *testing.T, m *mockAuthZClient) {
-				m.On("HasAccess", mock.Anything, "FakeId", "grafana-appwithrbac-app.patents:read", mock.Anything).Return(true, nil)
+				m.On("HasAccess", mock.Anything, "FakeId", "myorg-appwithrbac-app.patents:read", mock.Anything).Return(true, nil)
 			},
 			expStatus: http.StatusOK,
 		},
@@ -113,7 +113,7 @@ func TestCallResource(t *testing.T) {
 			method: http.MethodGet,
 			path:   "papers",
 			init: func(t *testing.T, m *mockAuthZClient) {
-				m.On("HasAccess", mock.Anything, "FakeId", "grafana-appwithrbac-app.papers:read", mock.Anything).Return(false, nil)
+				m.On("HasAccess", mock.Anything, "FakeId", "myorg-appwithrbac-app.papers:read", mock.Anything).Return(false, nil)
 			},
 			expStatus: http.StatusForbidden,
 		},
@@ -122,7 +122,7 @@ func TestCallResource(t *testing.T) {
 			method: http.MethodGet,
 			path:   "patents",
 			init: func(t *testing.T, m *mockAuthZClient) {
-				m.On("HasAccess", mock.Anything, "FakeId", "grafana-appwithrbac-app.patents:read", mock.Anything).Return(false, nil)
+				m.On("HasAccess", mock.Anything, "FakeId", "myorg-appwithrbac-app.patents:read", mock.Anything).Return(false, nil)
 			},
 			expStatus: http.StatusForbidden,
 		},
diff --git a/examples/app-with-rbac/provisioning/plugins/apps.yaml b/examples/app-with-rbac/provisioning/plugins/apps.yaml
index e6958c966..bd320e336 100644
--- a/examples/app-with-rbac/provisioning/plugins/apps.yaml
+++ b/examples/app-with-rbac/provisioning/plugins/apps.yaml
@@ -1,7 +1,7 @@
 apiVersion: 1
 
 apps:
-  - type: 'grafana-appwithrbac-app'
+  - type: 'myorg-appwithrbac-app'
     org_id: 1
     org_name: 'grafana'
     disabled: false
diff --git a/examples/app-with-rbac/src/components/App/App.tsx b/examples/app-with-rbac/src/components/App/App.tsx
index 7be5f0b20..d66a1bb5e 100644
--- a/examples/app-with-rbac/src/components/App/App.tsx
+++ b/examples/app-with-rbac/src/components/App/App.tsx
@@ -8,10 +8,10 @@ import { contextSrv } from 'grafana/app/core/core';
 
 export function App() {
   let routes = [<Route exact path={prefixRoute(ROUTES.Hello)} component={Hello} key="hello" />];
-  if (contextSrv.hasPermission('grafana-appwithrbac-app.papers:read')) {
+  if (contextSrv.hasPermission('myorg-appwithrbac-app.papers:read')) {
     routes.push(<Route exact path={prefixRoute(ROUTES.ResearchDocs)} component={ResearchDocs} key="documents" />);
   }
-  if (contextSrv.hasPermission('grafana-appwithrbac-app.patents:read')) {
+  if (contextSrv.hasPermission('myorg-appwithrbac-app.patents:read')) {
     routes.push(<Route exact path={prefixRoute(ROUTES.Patents)} component={Patents} key="patents" />);
   }
 
diff --git a/examples/app-with-rbac/src/pages/Hello.tsx b/examples/app-with-rbac/src/pages/Hello.tsx
index 6a8ad7353..4e1ee3992 100644
--- a/examples/app-with-rbac/src/pages/Hello.tsx
+++ b/examples/app-with-rbac/src/pages/Hello.tsx
@@ -18,12 +18,12 @@ export function Hello() {
           <ul className={s.list}>
             <li>
               &#128196; Research Documents: Accessible to individuals with the{' '}
-              <span className={s.orange}>grafana-appwithrbac-app.papers:read</span> permission, which is granted by
+              <span className={s.orange}>myorg-appwithrbac-app.papers:read</span> permission, which is granted by
               default to <span className={s.orange}>Viewers</span>.
             </li>
             <li>
               &#x1F512; Patents: Accessible to individuals with the{' '}
-              <span className={s.orange}>grafana-appwithrbac-app.patents:read</span> permission, which is granted by
+              <span className={s.orange}>myorg-appwithrbac-app.patents:read</span> permission, which is granted by
               default to <span className={s.orange}>Administrators</span> only.
             </li>
           </ul>
diff --git a/examples/app-with-rbac/src/pages/Patents.tsx b/examples/app-with-rbac/src/pages/Patents.tsx
index b4692ed3f..e39282a8e 100644
--- a/examples/app-with-rbac/src/pages/Patents.tsx
+++ b/examples/app-with-rbac/src/pages/Patents.tsx
@@ -36,7 +36,7 @@ export function Patents() {
       setIsLoading(true);
       setError(null);
       try {
-        const response = await fetch('/api/plugins/grafana-appwithrbac-app/resources/patents', { method: 'GET' });
+        const response = await fetch('/api/plugins/myorg-appwithrbac-app/resources/patents', { method: 'GET' });
 
         if (!response.ok) {
           throw new Error('Request failed. Status ' + response.statusText);
@@ -71,7 +71,7 @@ export function Patents() {
       <div data-testid={testIds.patents.container}>
         <div className={s.large}>
           &#x1F512; Normally restricted to <span className={s.orange}>Administrators</span> (requires{' '}
-          <span className={s.orange}>grafana-appwithrbac-app.patents:read</span>).
+          <span className={s.orange}>myorg-appwithrbac-app.patents:read</span>).
         </div>
         {content}
       </div>
diff --git a/examples/app-with-rbac/src/pages/ResearchDocs.tsx b/examples/app-with-rbac/src/pages/ResearchDocs.tsx
index 89721ee26..097666fb9 100644
--- a/examples/app-with-rbac/src/pages/ResearchDocs.tsx
+++ b/examples/app-with-rbac/src/pages/ResearchDocs.tsx
@@ -36,7 +36,7 @@ export function ResearchDocs() {
       setIsLoading(true);
       setError(null);
       try {
-        const response = await fetch('/api/plugins/grafana-appwithrbac-app/resources/papers', { method: 'GET' });
+        const response = await fetch('/api/plugins/myorg-appwithrbac-app/resources/papers', { method: 'GET' });
 
         if (!response.ok) {
           throw new Error('Request failed. Status ' + response.statusText);
@@ -71,7 +71,7 @@ export function ResearchDocs() {
       <div data-testid={testIds.researchDocs.container}>
         <div className={s.large}>
           &#x1F512; Normally accessible to <span className={s.orange}>anyone</span> (requires{' '}
-          <span className={s.orange}>grafana-appwithrbac-app.papers:read</span>).
+          <span className={s.orange}>myorg-appwithrbac-app.papers:read</span>).
         </div>
         {content}
       </div>
diff --git a/examples/app-with-rbac/src/plugin.json b/examples/app-with-rbac/src/plugin.json
index 58859b4f6..f67f6f6f6 100644
--- a/examples/app-with-rbac/src/plugin.json
+++ b/examples/app-with-rbac/src/plugin.json
@@ -1,10 +1,10 @@
 {
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json",
   "type": "app",
-  "name": "Grafana app with RBAC",
-  "id": "grafana-appwithrbac-app",
+  "name": "App with RBAC",
+  "id": "myorg-appwithrbac-app",
   "backend": true,
-  "executable": "gpx_grafana_appwithrbac_app",
+  "executable": "gpx_myorg_appwithrbac_app",
   "info": {
     "keywords": [
       "app",
@@ -42,7 +42,7 @@
       "type": "page",
       "name": "Research documents",
       "path": "/a/%PLUGIN_ID%/research-docs",
-      "action": "grafana-appwithrbac-app.papers:read",
+      "action": "myorg-appwithrbac-app.papers:read",
       "addToNav": true,
       "defaultNav": false
     },
@@ -50,7 +50,7 @@
       "type": "page",
       "name": "Patents",
       "path": "/a/%PLUGIN_ID%/patents",
-      "action": "grafana-appwithrbac-app.patents:read",
+      "action": "myorg-appwithrbac-app.patents:read",
       "addToNav": true,
       "defaultNav": false
     }
@@ -62,7 +62,7 @@
         "description": "Read patents",
         "permissions": [
           {
-            "action": "grafana-appwithrbac-app.patents:read"
+            "action": "myorg-appwithrbac-app.patents:read"
           }
         ]
       },
@@ -76,7 +76,7 @@
         "description": "Read research papers",
         "permissions": [
           {
-            "action": "grafana-appwithrbac-app.papers:read"
+            "action": "myorg-appwithrbac-app.papers:read"
           }
         ]
       },
diff --git a/examples/app-with-service-account/.config/docker-compose-base.yaml b/examples/app-with-service-account/.config/docker-compose-base.yaml
index 47d228250..252a4b9bf 100644
--- a/examples/app-with-service-account/.config/docker-compose-base.yaml
+++ b/examples/app-with-service-account/.config/docker-compose-base.yaml
@@ -1,7 +1,7 @@
 services:
   grafana:
     user: root
-    container_name: 'grafana-appwithserviceaccount-app'
+    container_name: 'myorg-appwithserviceaccount-app'
 
     build:
       context: .
@@ -19,13 +19,13 @@ services:
     cap_add:
       - SYS_PTRACE
     volumes:
-      - ../dist:/var/lib/grafana/plugins/grafana-appwithserviceaccount-app
+      - ../dist:/var/lib/grafana/plugins/myorg-appwithserviceaccount-app
       - ../provisioning:/etc/grafana/provisioning
-      - ..:/root/grafana-appwithserviceaccount-app
+      - ..:/root/myorg-appwithserviceaccount-app
 
     environment:
       NODE_ENV: development
-      GF_LOG_FILTERS: plugin.grafana-appwithserviceaccount-app:debug
+      GF_LOG_FILTERS: plugin.myorg-appwithserviceaccount-app:debug
       GF_LOG_LEVEL: debug
       GF_DATAPROXY_LOGGING: 1
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-appwithserviceaccount-app
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: myorg-appwithserviceaccount-app
diff --git a/examples/app-with-service-account/.config/supervisord/supervisord.conf b/examples/app-with-service-account/.config/supervisord/supervisord.conf
index 5afc69261..a4eeb542a 100644
--- a/examples/app-with-service-account/.config/supervisord/supervisord.conf
+++ b/examples/app-with-service-account/.config/supervisord/supervisord.conf
@@ -5,7 +5,7 @@ user=root
 [program:grafana]
 user=root
 directory=/var/lib/grafana
-command=bash -c 'while [ ! -f /root/grafana-appwithserviceaccount-app/dist/gpx_app_with_service_account* ]; do sleep 1; done; /run.sh'
+command=bash -c 'while [ ! -f /root/myorg-appwithserviceaccount-app/dist/gpx_app_with_service_account* ]; do sleep 1; done; /run.sh'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
@@ -26,7 +26,7 @@ autorestart=true
 
 [program:build-watcher]
 user=root
-command=/bin/bash -c 'while inotifywait -e modify,create,delete -r /var/lib/grafana/plugins/grafana-appwithserviceaccount-app; do echo "Change detected, restarting delve...";supervisorctl restart delve; done'
+command=/bin/bash -c 'while inotifywait -e modify,create,delete -r /var/lib/grafana/plugins/myorg-appwithserviceaccount-app; do echo "Change detected, restarting delve...";supervisorctl restart delve; done'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
@@ -37,8 +37,8 @@ autostart=true
 [program:mage-watcher]
 user=root
 environment=PATH="/usr/local/go/bin:/root/go/bin:%(ENV_PATH)s"
-directory=/root/grafana-appwithserviceaccount-app
-command=/bin/bash -c 'git config --global --add safe.directory /root/grafana-appwithserviceaccount-app && mage -v watch'
+directory=/root/myorg-appwithserviceaccount-app
+command=/bin/bash -c 'git config --global --add safe.directory /root/myorg-appwithserviceaccount-app && mage -v watch'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
diff --git a/examples/app-with-service-account/docker-compose.yaml b/examples/app-with-service-account/docker-compose.yaml
index 15a8d99a8..66cf25384 100644
--- a/examples/app-with-service-account/docker-compose.yaml
+++ b/examples/app-with-service-account/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.0'
 
 services:
   grafana:
-    container_name: 'grafana-appwithserviceaccount-app'
+    container_name: 'myorg-appwithserviceaccount-app'
     build:
       context: ./.config
       args:
@@ -13,5 +13,5 @@ services:
     environment:
       - GF_FEATURE_TOGGLES_ENABLE=externalServiceAccounts
     volumes:
-      - ./dist:/var/lib/grafana/plugins/grafana-appwithserviceaccount-app
+      - ./dist:/var/lib/grafana/plugins/myorg-appwithserviceaccount-app
       - ./provisioning:/etc/grafana/provisioning
diff --git a/examples/app-with-service-account/pkg/main.go b/examples/app-with-service-account/pkg/main.go
index 622f50e2f..f99be776a 100644
--- a/examples/app-with-service-account/pkg/main.go
+++ b/examples/app-with-service-account/pkg/main.go
@@ -16,7 +16,7 @@ func main() {
 	// argument. This factory will be automatically called on incoming request
 	// from Grafana to create different instances of `App` (per plugin
 	// ID).
-	if err := app.Manage("grafana-appwithserviceaccount-app", plugin.NewApp, app.ManageOpts{}); err != nil {
+	if err := app.Manage("myorg-appwithserviceaccount-app", plugin.NewApp, app.ManageOpts{}); err != nil {
 		log.DefaultLogger.Error(err.Error())
 		os.Exit(1)
 	}
diff --git a/examples/app-with-service-account/provisioning/plugins/apps.yaml b/examples/app-with-service-account/provisioning/plugins/apps.yaml
index de5169ce2..dd6f0a282 100644
--- a/examples/app-with-service-account/provisioning/plugins/apps.yaml
+++ b/examples/app-with-service-account/provisioning/plugins/apps.yaml
@@ -1,7 +1,7 @@
 apiVersion: 1
 
 apps:
-  - type: 'grafana-appwithserviceaccount-app'
+  - type: 'myorg-appwithserviceaccount-app'
     org_id: 1
     org_name: Main Org.
     disabled: false
diff --git a/examples/app-with-service-account/src/pages/PageOne.tsx b/examples/app-with-service-account/src/pages/PageOne.tsx
index 39cd86107..3a1019e21 100644
--- a/examples/app-with-service-account/src/pages/PageOne.tsx
+++ b/examples/app-with-service-account/src/pages/PageOne.tsx
@@ -12,7 +12,7 @@ export function PageOne() {
 
   const backendSrv = getBackendSrv();
   const { error, loading, value } = useAsync(() => {
-    return Promise.all([backendSrv.get(`api/plugins/grafana-appwithserviceaccount-app/health`)]);
+    return Promise.all([backendSrv.get(`api/plugins/myorg-appwithserviceaccount-app/health`)]);
   });
   const [apiPath, setApiPath] = useState('/search');
   const [apiResponse, setApiResponse] = useState({});
@@ -46,7 +46,7 @@ export function PageOne() {
       params = { ...params, body: JSON.stringify(parsedBody) };
     }
     backendSrv
-      .get(`api/plugins/grafana-appwithserviceaccount-app/resources/api${apiPath}`, params)
+      .get(`api/plugins/myorg-appwithserviceaccount-app/resources/api${apiPath}`, params)
       .then((response) => {
         setApiResponse(response.results);
         setApiToken(response.token);
diff --git a/examples/app-with-service-account/src/plugin.json b/examples/app-with-service-account/src/plugin.json
index 8900d8a74..70817d725 100644
--- a/examples/app-with-service-account/src/plugin.json
+++ b/examples/app-with-service-account/src/plugin.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json",
   "type": "app",
   "name": "App With Service Account",
-  "id": "grafana-appwithserviceaccount-app",
+  "id": "myorg-appwithserviceaccount-app",
   "backend": true,
   "executable": "gpx_app_with_service_account",
   "info": {
diff --git a/examples/datasource-basic/.config/docker-compose-base.yaml b/examples/datasource-basic/.config/docker-compose-base.yaml
index 107451c4f..332eb7b13 100644
--- a/examples/datasource-basic/.config/docker-compose-base.yaml
+++ b/examples/datasource-basic/.config/docker-compose-base.yaml
@@ -1,7 +1,7 @@
 services:
   grafana:
     user: root
-    container_name: 'grafana-basic-datasource'
+    container_name: 'myorg-basic-datasource'
 
     build:
       context: .
@@ -19,13 +19,13 @@ services:
     cap_add:
       - SYS_PTRACE
     volumes:
-      - ../dist:/var/lib/grafana/plugins/grafana-basic-datasource
+      - ../dist:/var/lib/grafana/plugins/myorg-basic-datasource
       - ../provisioning:/etc/grafana/provisioning
-      - ..:/root/grafana-basic-datasource
+      - ..:/root/myorg-basic-datasource
 
     environment:
       NODE_ENV: development
-      GF_LOG_FILTERS: plugin.grafana-basic-datasource:debug
+      GF_LOG_FILTERS: plugin.myorg-basic-datasource:debug
       GF_LOG_LEVEL: debug
       GF_DATAPROXY_LOGGING: 1
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: grafana-basic-datasource
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: myorg-basic-datasource
diff --git a/examples/datasource-basic/.config/supervisord/supervisord.conf b/examples/datasource-basic/.config/supervisord/supervisord.conf
index 5723e2faa..84858f49e 100644
--- a/examples/datasource-basic/.config/supervisord/supervisord.conf
+++ b/examples/datasource-basic/.config/supervisord/supervisord.conf
@@ -5,7 +5,7 @@ user=root
 [program:grafana]
 user=root
 directory=/var/lib/grafana
-command=bash -c 'while [ ! -f /root/grafana-basic-datasource/dist/gpx_basic_datasource* ]; do sleep 1; done; /run.sh'
+command=bash -c 'while [ ! -f /root/myorg-basic-datasource/dist/gpx_basic_datasource* ]; do sleep 1; done; /run.sh'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
@@ -26,7 +26,7 @@ autorestart=true
 
 [program:build-watcher]
 user=root
-command=/bin/bash -c 'while inotifywait -e modify,create,delete -r /var/lib/grafana/plugins/grafana-basic-datasource; do echo "Change detected, restarting delve...";supervisorctl restart delve; done'
+command=/bin/bash -c 'while inotifywait -e modify,create,delete -r /var/lib/grafana/plugins/myorg-basic-datasource; do echo "Change detected, restarting delve...";supervisorctl restart delve; done'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
@@ -37,8 +37,8 @@ autostart=true
 [program:mage-watcher]
 user=root
 environment=PATH="/usr/local/go/bin:/root/go/bin:%(ENV_PATH)s"
-directory=/root/grafana-basic-datasource
-command=/bin/bash -c 'git config --global --add safe.directory /root/grafana-basic-datasource && mage -v watch'
+directory=/root/myorg-basic-datasource
+command=/bin/bash -c 'git config --global --add safe.directory /root/myorg-basic-datasource && mage -v watch'
 stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
diff --git a/examples/datasource-basic/pkg/main.go b/examples/datasource-basic/pkg/main.go
index 2e94650b7..b7042c6d9 100644
--- a/examples/datasource-basic/pkg/main.go
+++ b/examples/datasource-basic/pkg/main.go
@@ -3,9 +3,9 @@ package main
 import (
 	"os"
 
+	"github.com/grafana/basic-datasource/pkg/plugin"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/basic-datasource/pkg/plugin"
 )
 
 func main() {
@@ -17,7 +17,7 @@ func main() {
 	// from Grafana to create different instances of SampleDatasource (per configured datasource in Grafana).
 	// When datasource configuration changed Dispose method will be called and
 	// new datasource instance created using NewSampleDatasource factory.
-	if err := datasource.Manage("grafana-basic-datasource", plugin.NewDatasource, datasource.ManageOpts{}); err != nil {
+	if err := datasource.Manage("myorg-basic-datasource", plugin.NewDatasource, datasource.ManageOpts{}); err != nil {
 		log.DefaultLogger.Error(err.Error())
 		os.Exit(1)
 	}
diff --git a/examples/datasource-basic/provisioning/dashboards/dashboard.json b/examples/datasource-basic/provisioning/dashboards/dashboard.json
index 81db57e42..f45ebbbd0 100644
--- a/examples/datasource-basic/provisioning/dashboards/dashboard.json
+++ b/examples/datasource-basic/provisioning/dashboards/dashboard.json
@@ -97,7 +97,7 @@
       "targets": [
         {
           "datasource": {
-            "type": "grafana-basic-datasource",
+            "type": "myorg-basic-datasource",
             "uid": "U9sW5bank"
           },
           "queryType": "TimeSeries",
@@ -110,7 +110,7 @@
     },
     {
       "datasource": {
-        "type": "grafana-basic-datasource",
+        "type": "myorg-basic-datasource",
         "uid": "U9sW5bank"
       },
       "fieldConfig": {
@@ -184,7 +184,7 @@
       "targets": [
         {
           "datasource": {
-            "type": "grafana-basic-datasource",
+            "type": "myorg-basic-datasource",
             "uid": "U9sW5bank"
           },
           "queryType": "Table",
@@ -243,4 +243,4 @@
   "uid": "lYi_st-7z",
   "version": 1,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/examples/datasource-basic/provisioning/datasources/datasources.yml b/examples/datasource-basic/provisioning/datasources/datasources.yml
index 84425d473..4f3b24391 100644
--- a/examples/datasource-basic/provisioning/datasources/datasources.yml
+++ b/examples/datasource-basic/provisioning/datasources/datasources.yml
@@ -2,7 +2,7 @@ apiVersion: 1
 
 datasources:
   - name: Basic Example
-    type: grafana-basic-datasource
+    type: myorg-basic-datasource
     access: proxy
     isDefault: true
     orgId: 1
diff --git a/examples/datasource-basic/src/plugin.json b/examples/datasource-basic/src/plugin.json
index 043a0452f..6beefcea3 100644
--- a/examples/datasource-basic/src/plugin.json
+++ b/examples/datasource-basic/src/plugin.json
@@ -1,8 +1,8 @@
 {
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json",
   "type": "datasource",
-  "name": "Basic Datasource",
-  "id": "grafana-basic-datasource",
+  "name": "Basic Data Source",
+  "id": "myorg-basic-datasource",
   "metrics": true,
   "backend": true,
   "executable": "gpx_basic_datasource",
diff --git a/examples/datasource-http-backend/src/plugin.json b/examples/datasource-http-backend/src/plugin.json
index b70ced84a..271af3170 100644
--- a/examples/datasource-http-backend/src/plugin.json
+++ b/examples/datasource-http-backend/src/plugin.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json",
   "type": "datasource",
-  "name": "Datasource Http Backend",
+  "name": "HTTP Backend Data Source",
   "id": "myorg-httpbackend-datasource",
   "metrics": true,
   "backend": true,
diff --git a/examples/datasource-http/.config/docker-compose-base.yaml b/examples/datasource-http/.config/docker-compose-base.yaml
index 64ca0c0d0..1aa66f59c 100644
--- a/examples/datasource-http/.config/docker-compose-base.yaml
+++ b/examples/datasource-http/.config/docker-compose-base.yaml
@@ -1,7 +1,7 @@
 services:
   grafana:
     user: root
-    container_name: 'example-http-datasource'
+    container_name: 'myorg-http-datasource'
 
     build:
       context: .
@@ -13,13 +13,13 @@ services:
     ports:
       - 3000:3000/tcp
     volumes:
-      - ../dist:/var/lib/grafana/plugins/example-http-datasource
+      - ../dist:/var/lib/grafana/plugins/myorg-http-datasource
       - ../provisioning:/etc/grafana/provisioning
-      - ..:/root/example-http-datasource
+      - ..:/root/myorg-http-datasource
 
     environment:
       NODE_ENV: development
-      GF_LOG_FILTERS: plugin.example-http-datasource:debug
+      GF_LOG_FILTERS: plugin.myorg-http-datasource:debug
       GF_LOG_LEVEL: debug
       GF_DATAPROXY_LOGGING: 1
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: example-http-datasource
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: myorg-http-datasource
diff --git a/examples/datasource-http/package-lock.json b/examples/datasource-http/package-lock.json
index 640cedf93..7bb7fbcbe 100644
--- a/examples/datasource-http/package-lock.json
+++ b/examples/datasource-http/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "example-http-datasource",
+  "name": "myorg-http-datasource",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "example-http-datasource",
+      "name": "myorg-http-datasource",
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/examples/datasource-http/package.json b/examples/datasource-http/package.json
index 98435942a..fead20cf6 100644
--- a/examples/datasource-http/package.json
+++ b/examples/datasource-http/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "example-http-datasource",
+  "name": "myorg-http-datasource",
   "version": "1.0.0",
   "description": "An example plugin for Grafana",
   "scripts": {
diff --git a/examples/datasource-http/provisioning/datasources/datasources.yml b/examples/datasource-http/provisioning/datasources/datasources.yml
index dfa18bb6a..d5b0c3180 100644
--- a/examples/datasource-http/provisioning/datasources/datasources.yml
+++ b/examples/datasource-http/provisioning/datasources/datasources.yml
@@ -2,7 +2,7 @@ apiVersion: 1
 
 datasources:
   - name: 'Http Data Source'
-    type: example-http-datasource
+    type: myorg-http-datasource
     access: proxy
     isDefault: false
     orgId: 1
diff --git a/examples/datasource-http/src/plugin.json b/examples/datasource-http/src/plugin.json
index 9ce2b0357..50d098a07 100644
--- a/examples/datasource-http/src/plugin.json
+++ b/examples/datasource-http/src/plugin.json
@@ -1,8 +1,8 @@
 {
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json",
   "type": "datasource",
-  "name": "HTTP",
-  "id": "example-http-datasource",
+  "name": "HTTP Data Source",
+  "id": "myorg-http-datasource",
   "metrics": true,
   "info": {
     "description": "",
diff --git a/examples/datasource-logs/.config/docker-compose-base.yaml b/examples/datasource-logs/.config/docker-compose-base.yaml
index 1f9d5c42a..0838f53bc 100644
--- a/examples/datasource-logs/.config/docker-compose-base.yaml
+++ b/examples/datasource-logs/.config/docker-compose-base.yaml
@@ -1,7 +1,7 @@
 services:
   grafana:
     user: root
-    container_name: 'example-logs-datasource'
+    container_name: 'myorg-logs-datasource'
 
     build:
       context: .
@@ -13,13 +13,13 @@ services:
     ports:
       - 3000:3000/tcp
     volumes:
-      - ../dist:/var/lib/grafana/plugins/example-logs-datasource
+      - ../dist:/var/lib/grafana/plugins/myorg-logs-datasource
       - ../provisioning:/etc/grafana/provisioning
-      - ..:/root/example-logs-datasource
+      - ..:/root/myorg-logs-datasource
 
     environment:
       NODE_ENV: development
-      GF_LOG_FILTERS: plugin.example-logs-datasource:debug
+      GF_LOG_FILTERS: plugin.myorg-logs-datasource:debug
       GF_LOG_LEVEL: debug
       GF_DATAPROXY_LOGGING: 1
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: example-logs-datasource
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: myorg-logs-datasource
diff --git a/examples/datasource-logs/package-lock.json b/examples/datasource-logs/package-lock.json
index 5fa890512..18d3b784d 100644
--- a/examples/datasource-logs/package-lock.json
+++ b/examples/datasource-logs/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "example-logs-datasource",
+  "name": "myorg-logs-datasource",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "example-logs-datasource",
+      "name": "myorg-logs-datasource",
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/examples/datasource-logs/package.json b/examples/datasource-logs/package.json
index 2d365c0a7..22e9bdb8f 100644
--- a/examples/datasource-logs/package.json
+++ b/examples/datasource-logs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "example-logs-datasource",
+  "name": "myorg-logs-datasource",
   "version": "1.0.0",
   "description": "",
   "scripts": {
diff --git a/examples/datasource-logs/provisioning/datasources/datasources.yml b/examples/datasource-logs/provisioning/datasources/datasources.yml
index a2cc962f7..e1df57f88 100644
--- a/examples/datasource-logs/provisioning/datasources/datasources.yml
+++ b/examples/datasource-logs/provisioning/datasources/datasources.yml
@@ -2,7 +2,7 @@ apiVersion: 1
 
 datasources:
   - name: Datasource logs
-    type: example-logs-datasource
+    type: myorg-logs-datasource
     access: proxy
     isDefault: true
     orgId: 1
diff --git a/examples/datasource-logs/src/plugin.json b/examples/datasource-logs/src/plugin.json
index a25ee2dc2..85f88bd46 100644
--- a/examples/datasource-logs/src/plugin.json
+++ b/examples/datasource-logs/src/plugin.json
@@ -1,8 +1,8 @@
 {
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json",
   "type": "datasource",
-  "name": "grafana-logs-datasource",
-  "id": "example-logs-datasource",
+  "name": "Logs Data Source",
+  "id": "myorg-logs-datasource",
   "metrics": true,
   "logs": true,
   "streaming": true,
diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/docker-compose-base.yaml b/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/docker-compose-base.yaml
index 5599bb39c..82fb6ae34 100644
--- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/docker-compose-base.yaml
+++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/.config/docker-compose-base.yaml
@@ -1,7 +1,7 @@
 services:
   grafana:
     user: root
-    container_name: 'example-websocket-datasource'
+    container_name: 'myorg-websocket-datasource'
 
     build:
       context: .
@@ -13,13 +13,13 @@ services:
     ports:
       - 3000:3000/tcp
     volumes:
-      - ../dist:/var/lib/grafana/plugins/example-websocket-datasource
+      - ../dist:/var/lib/grafana/plugins/myorg-websocket-datasource
       - ../provisioning:/etc/grafana/provisioning
-      - ..:/root/example-websocket-datasource
+      - ..:/root/myorg-websocket-datasource
 
     environment:
       NODE_ENV: development
-      GF_LOG_FILTERS: plugin.example-websocket-datasource:debug
+      GF_LOG_FILTERS: plugin.myorg-websocket-datasource:debug
       GF_LOG_LEVEL: debug
       GF_DATAPROXY_LOGGING: 1
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: example-websocket-datasource
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: myorg-websocket-datasource
diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/docker-compose.yaml b/examples/datasource-streaming-websocket/streaming-websocket-plugin/docker-compose.yaml
index 537ebbf1e..7db118de6 100644
--- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/docker-compose.yaml
+++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.0'
 
 services:
   grafana:
-    container_name: 'example-websocket-datasource'
+    container_name: 'myorg-websocket-datasource'
     build:
       context: ./.config
       args:
@@ -11,7 +11,7 @@ services:
     ports:
       - 3000:3000/tcp
     volumes:
-      - ./dist:/var/lib/grafana/plugins/example-websocket-datasource
+      - ./dist:/var/lib/grafana/plugins/myorg-websocket-datasource
       - ./provisioning:/etc/grafana/provisioning
     extra_hosts:
       - 'host.docker.internal:host-gateway'
diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/package-lock.json b/examples/datasource-streaming-websocket/streaming-websocket-plugin/package-lock.json
index 70ca47117..0f25d771a 100644
--- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/package-lock.json
+++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "example-websocket-datasource",
+  "name": "myorg-websocket-datasource",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "example-websocket-datasource",
+      "name": "myorg-websocket-datasource",
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/package.json b/examples/datasource-streaming-websocket/streaming-websocket-plugin/package.json
index 3413889b2..9b1eeff7d 100644
--- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/package.json
+++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "example-websocket-datasource",
+  "name": "myorg-websocket-datasource",
   "version": "1.0.0",
   "description": "An example plugin for Grafana",
   "scripts": {
diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/provisioning/datasources/datasources.yml b/examples/datasource-streaming-websocket/streaming-websocket-plugin/provisioning/datasources/datasources.yml
index b3a860cd0..168ec1ad5 100644
--- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/provisioning/datasources/datasources.yml
+++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/provisioning/datasources/datasources.yml
@@ -2,7 +2,7 @@ apiVersion: 1
 
 datasources:
   - name: Streaming websocket datasource
-    type: example-websocket-datasource
+    type: myorg-websocket-datasource
     access: proxy
     isDefault: true
     orgId: 1
diff --git a/examples/datasource-streaming-websocket/streaming-websocket-plugin/src/plugin.json b/examples/datasource-streaming-websocket/streaming-websocket-plugin/src/plugin.json
index a4a96730c..2db2b8879 100644
--- a/examples/datasource-streaming-websocket/streaming-websocket-plugin/src/plugin.json
+++ b/examples/datasource-streaming-websocket/streaming-websocket-plugin/src/plugin.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json",
   "type": "datasource",
   "name": "Streaming websocket example",
-  "id": "example-websocket-datasource",
+  "id": "myorg-websocket-datasource",
   "info": {
     "description": "",
     "author": {
diff --git a/examples/panel-basic/.config/docker-compose-base.yaml b/examples/panel-basic/.config/docker-compose-base.yaml
index 642d39fd8..9dc6cde36 100644
--- a/examples/panel-basic/.config/docker-compose-base.yaml
+++ b/examples/panel-basic/.config/docker-compose-base.yaml
@@ -1,7 +1,7 @@
 services:
   grafana:
     user: root
-    container_name: 'basic-panel'
+    container_name: 'myorg-basic-panel'
 
     build:
       context: .
@@ -13,13 +13,13 @@ services:
     ports:
       - 3000:3000/tcp
     volumes:
-      - ../dist:/var/lib/grafana/plugins/basic-panel
+      - ../dist:/var/lib/grafana/plugins/myorg-basic-panel
       - ../provisioning:/etc/grafana/provisioning
-      - ..:/root/basic-panel
+      - ..:/root/myorg-basic-panel
 
     environment:
       NODE_ENV: development
-      GF_LOG_FILTERS: plugin.basic-panel:debug
+      GF_LOG_FILTERS: plugin.myorg-basic-panel:debug
       GF_LOG_LEVEL: debug
       GF_DATAPROXY_LOGGING: 1
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: basic-panel
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: myorg-basic-panel
diff --git a/examples/panel-basic/docker-compose.yaml b/examples/panel-basic/docker-compose.yaml
index fa0a67bbc..1aeae0efd 100644
--- a/examples/panel-basic/docker-compose.yaml
+++ b/examples/panel-basic/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.0'
 
 services:
   grafana:
-    container_name: 'basic-panel'
+    container_name: 'myorg-basic-panel'
     build:
       context: ./.config
       args:
@@ -13,5 +13,5 @@ services:
     ports:
       - 3000:3000/tcp
     volumes:
-      - ./dist:/var/lib/grafana/plugins/basic-panel
+      - ./dist:/var/lib/grafana/plugins/myorg-basic-panel
       - ./provisioning:/etc/grafana/provisioning
diff --git a/examples/panel-basic/package-lock.json b/examples/panel-basic/package-lock.json
index fe7ef12b2..e4c26c76a 100644
--- a/examples/panel-basic/package-lock.json
+++ b/examples/panel-basic/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "basic-panel",
+  "name": "myorg-basic-panel",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "basic-panel",
+      "name": "myorg-basic-panel",
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/examples/panel-basic/package.json b/examples/panel-basic/package.json
index 6038b2064..651ff2841 100644
--- a/examples/panel-basic/package.json
+++ b/examples/panel-basic/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "basic-panel",
+  "name": "myorg-basic-panel",
   "version": "1.0.0",
   "description": "Showcase how to build a basic panel plugin",
   "scripts": {
diff --git a/examples/panel-basic/provisioning/dashboards/panels.json b/examples/panel-basic/provisioning/dashboards/panels.json
index 87f905590..7056b7734 100644
--- a/examples/panel-basic/provisioning/dashboards/panels.json
+++ b/examples/panel-basic/provisioning/dashboards/panels.json
@@ -126,7 +126,7 @@
         }
       ],
       "title": "Basic Panel",
-      "type": "basic-panel"
+      "type": "myorg-basic-panel"
     },
     {
       "datasource": {
@@ -187,7 +187,7 @@
         }
       ],
       "title": "Panel Title",
-      "type": "basic-panel"
+      "type": "myorg-basic-panel"
     }
   ],
   "refresh": "",
diff --git a/examples/panel-basic/src/plugin.json b/examples/panel-basic/src/plugin.json
index c76861e4d..054eef6e6 100644
--- a/examples/panel-basic/src/plugin.json
+++ b/examples/panel-basic/src/plugin.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json",
   "type": "panel",
   "name": "Basic Panel",
-  "id": "basic-panel",
+  "id": "myorg-basic-panel",
   "info": {
     "keywords": [
       "panel",
@@ -19,11 +19,11 @@
     "links": [
       {
         "name": "Website",
-        "url": "https://github.com/grafana/grafana-plugin-examples/examples/basic-panel"
+        "url": "https://github.com/grafana/grafana-plugin-examples/examples/myorg-basic-panel"
       },
       {
         "name": "License",
-        "url": "https://github.com/grafana/grafana-plugin-examples/examples/basic-panel/blob/master/LICENSE"
+        "url": "https://github.com/grafana/grafana-plugin-examples/examples/myorg-basic-panel/blob/master/LICENSE"
       }
     ],
     "screenshots": [],
diff --git a/examples/panel-frame-select/.config/docker-compose-base.yaml b/examples/panel-frame-select/.config/docker-compose-base.yaml
index 35d96db51..034833577 100644
--- a/examples/panel-frame-select/.config/docker-compose-base.yaml
+++ b/examples/panel-frame-select/.config/docker-compose-base.yaml
@@ -1,7 +1,7 @@
 services:
   grafana:
     user: root
-    container_name: 'example-frameselect-panel'
+    container_name: 'myorg-frameselect-panel'
 
     build:
       context: .
@@ -13,13 +13,13 @@ services:
     ports:
       - 3000:3000/tcp
     volumes:
-      - ../dist:/var/lib/grafana/plugins/example-frameselect-panel
+      - ../dist:/var/lib/grafana/plugins/myorg-frameselect-panel
       - ../provisioning:/etc/grafana/provisioning
-      - ..:/root/example-frameselect-panel
+      - ..:/root/myorg-frameselect-panel
 
     environment:
       NODE_ENV: development
-      GF_LOG_FILTERS: plugin.example-frameselect-panel:debug
+      GF_LOG_FILTERS: plugin.myorg-frameselect-panel:debug
       GF_LOG_LEVEL: debug
       GF_DATAPROXY_LOGGING: 1
-      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: example-frameselect-panel
+      GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS: myorg-frameselect-panel
diff --git a/examples/panel-frame-select/package-lock.json b/examples/panel-frame-select/package-lock.json
index cf7991254..eef565dac 100644
--- a/examples/panel-frame-select/package-lock.json
+++ b/examples/panel-frame-select/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "example-frameselect-panel",
+  "name": "myorg-frameselect-panel",
   "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "example-frameselect-panel",
+      "name": "myorg-frameselect-panel",
       "version": "1.0.0",
       "license": "Apache-2.0",
       "dependencies": {
diff --git a/examples/panel-frame-select/package.json b/examples/panel-frame-select/package.json
index 1fe30382a..0f1bee0a2 100644
--- a/examples/panel-frame-select/package.json
+++ b/examples/panel-frame-select/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "example-frameselect-panel",
+  "name": "myorg-frameselect-panel",
   "version": "1.0.0",
   "description": "An example plugin for Grafana",
   "scripts": {
diff --git a/examples/panel-frame-select/provisioning/dashboards/panels.json b/examples/panel-frame-select/provisioning/dashboards/panels.json
index 22c4e6a86..79a12c321 100644
--- a/examples/panel-frame-select/provisioning/dashboards/panels.json
+++ b/examples/panel-frame-select/provisioning/dashboards/panels.json
@@ -40,7 +40,7 @@
         "text": "Default value of text input option"
       },
       "title": "Panel Title",
-      "type": "example-frameselect-panel"
+      "type": "myorg-frameselect-panel"
     },
     {
       "datasource": {
@@ -71,7 +71,7 @@
         }
       ],
       "title": "Panel frame select",
-      "type": "example-frameselect-panel"
+      "type": "myorg-frameselect-panel"
     }
   ],
   "refresh": "",
@@ -90,4 +90,4 @@
   "uid": "cda759d7-d406-46fe-97f6-31b4752d79d9",
   "version": 1,
   "weekStart": ""
-}
\ No newline at end of file
+}
diff --git a/examples/panel-frame-select/src/plugin.json b/examples/panel-frame-select/src/plugin.json
index 7bfbd3c45..360d7922a 100644
--- a/examples/panel-frame-select/src/plugin.json
+++ b/examples/panel-frame-select/src/plugin.json
@@ -1,8 +1,8 @@
 {
   "$schema": "https://raw.githubusercontent.com/grafana/grafana/main/docs/sources/developers/plugins/plugin.schema.json",
   "type": "panel",
-  "name": "Example",
-  "id": "example-frameselect-panel",
+  "name": "Frame Select Example",
+  "id": "myorg-frameselect-panel",
   "info": {
     "description": "",
     "author": {