From 7d85183cab88fd296758cfaadeb44aa87bbf5b07 Mon Sep 17 00:00:00 2001
From: Ritwik Ranjan <ritwikranjan99@gmail.com>
Date: Thu, 23 Jan 2025 06:18:49 -0800
Subject: [PATCH] refactor: rename legacy control plane to standard and update
 related scripts and docs (#1259)

# Description

This pull request includes significant changes to transition from the
"legacy" to the "standard" directory and package structure. The changes
involve updates to Helm charts, Makefile commands, package imports, and
file paths.

Directory and package structure updates:

*
[`.github/workflows/release-charts.yaml`](diffhunk://#diff-711012dcc1f315d20ef98e04b14cbc0cb1a388641934c2151ac99f74ff11f62cL43-R43):
Updated the Helm package path from `legacy` to `standard`.
*
[`Makefile`](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L447-R447):
Updated multiple Helm install commands to use the `standard` directory
instead of `legacy`.
[[1]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L447-R447)
[[2]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L460-R460)
[[3]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L477-R477)
[[4]](diffhunk://#diff-76ed074a9305c04054cdebb9e9aad2d818052b07091de1f20cad0bbac34ffb52L496-R496)
*
[`cmd/root.go`](diffhunk://#diff-ab967ab1a2f3a1b769106eeb7bfe892ef0e81d1d27811fa15be08e6749feee1fL9-R9):
Changed package imports and daemon initialization from `legacy` to
`standard`.
[[1]](diffhunk://#diff-ab967ab1a2f3a1b769106eeb7bfe892ef0e81d1d27811fa15be08e6749feee1fL9-R9)
[[2]](diffhunk://#diff-ab967ab1a2f3a1b769106eeb7bfe892ef0e81d1d27811fa15be08e6749feee1fL31-R31)
* Renamed files from `legacy` to `standard`:
  * `cmd/legacy/daemon.go` to `cmd/standard/daemon.go`
  * `cmd/legacy/daemon_linux.go` to `cmd/standard/daemon_linux.go`
  * `cmd/legacy/daemon_windows.go` to `cmd/standard/daemon_windows.go`
*
[`crd/Makefile`](diffhunk://#diff-414956f6f35c3bc4a93c4c08592ee22397d76d99a1b728e1e33c65075a2a99c8L7-R7):
Updated the `HELM_CRD_DIR` path to use the `standard` directory.

File deletions and renames:

* Deleted `deploy/legacy/prometheus/retina/create-cm.sh`.
* Renamed
`deploy/legacy/manifests/controller/helm/retina/templates/NOTES.txt` to
`deploy/standard/manifests/controller/helm/retina/templates/NOTES.txt`
with updated paths inside the file.

## Related Issue

This PR will close #1115

## Checklist

- [x] I have read the [contributing
documentation](https://retina.sh/docs/contributing).
- [x] I signed and signed-off the commits (`git commit -S -s ...`). See
[this
documentation](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification)
on signing commits.
- [x] I have correctly attributed the author(s) of the code.
- [x] I have tested the changes locally.
- [x] I have followed the project's style guidelines.
- [x] I have updated the documentation, if necessary.
- [x] I have added tests, if applicable.

## Screenshots (if applicable) or Testing Completed

Please add any relevant screenshots or GIFs to showcase the changes
made.

## Additional Notes

Add any additional notes or context about the pull request here.

---

Please refer to the [CONTRIBUTING.md](../CONTRIBUTING.md) file for more
information on how to contribute to this project.

---------

Signed-off-by: Ritwik Ranjan <ritwikranjan99@gmail.com>
Co-authored-by: kamilprz <36544756+kamilprz@users.noreply.github.com>
---
 .github/workflows/release-charts.yaml                     | 2 +-
 Makefile                                                  | 8 ++++----
 cmd/root.go                                               | 4 ++--
 cmd/{legacy => standard}/daemon.go                        | 2 +-
 cmd/{legacy => standard}/daemon_linux.go                  | 2 +-
 cmd/{legacy => standard}/daemon_windows.go                | 2 +-
 crd/Makefile                                              | 2 +-
 deploy/legacy/prometheus/retina/create-cm.sh              | 3 ---
 .../{legacy => standard}/grafana/dashboards/clusters.json | 0
 deploy/{legacy => standard}/grafana/dashboards/dns.json   | 0
 .../grafana/dashboards/pod-level.json                     | 0
 .../manifests/controller/helm/retina/.helmignore          | 0
 .../manifests/controller/helm/retina/Chart.yaml           | 0
 .../controller/helm/retina/crds/retina.sh_captures.yaml   | 0
 .../helm/retina/crds/retina.sh_metricsconfigurations.yaml | 0
 .../helm/retina/crds/retina.sh_retinaendpoints.yaml       | 0
 .../helm/retina/crds/retina.sh_tracesconfigurations.yaml  | 0
 .../manifests/controller/helm/retina/templates/NOTES.txt  | 2 +-
 .../controller/helm/retina/templates/_helpers.tpl         | 0
 .../controller/helm/retina/templates/configmap.yaml       | 0
 .../controller/helm/retina/templates/daemonset.yaml       | 0
 .../controller/helm/retina/templates/networkobserver.yaml | 0
 .../controller/helm/retina/templates/operator.yaml        | 0
 .../controller/helm/retina/templates/podmonitor.yaml      | 0
 .../manifests/controller/helm/retina/templates/rbac.yaml  | 0
 .../controller/helm/retina/templates/service.yaml         | 0
 .../controller/helm/retina/templates/serviceaccount.yaml  | 0
 .../controller/helm/retina/templates/servicemonitor.yaml  | 0
 .../helm/retina/templates/tests/test-connection.yaml      | 0
 .../manifests/controller/helm/retina/values.yaml          | 0
 .../prometheus/ama-metrics-settings-configmap.yaml        | 0
 .../prometheus/collector-config-template.yml              | 0
 .../prometheus/deploy-retina-clusters.sh                  | 0
 .../prometheus/network-observability/create-cm.sh         | 2 +-
 .../network-observability/network-observability-svc.yaml  | 0
 .../prometheus/network-observability/prometheus-config    | 0
 .../prometheus/retina-windows/create-cm.sh                | 2 +-
 .../prometheus/retina-windows/prometheus-config           | 0
 deploy/standard/prometheus/retina/create-cm.sh            | 3 +++
 .../prometheus/retina/prometheus-config                   | 0
 deploy/{legacy => standard}/prometheus/values.yaml        | 0
 deploy/{legacy => standard}/registercrd.go                | 0
 deploy/{legacy => standard}/registercrd_test.go           | 0
 docs/02-Installation/01-Setup.md                          | 4 ++--
 docs/02-Installation/03-Config.md                         | 2 +-
 docs/02-Installation/04-prometheus.md                     | 6 +++---
 docs/02-Installation/05-grafana.md                        | 2 +-
 docs/02-Installation/aks-setup.md                         | 2 +-
 docs/03-Metrics/01-metrics-intro.md                       | 6 +++---
 docs/03-Metrics/modes/modes.md                            | 2 +-
 docs/04-Captures/03-managed-storage-account.md            | 4 ++--
 docs/05-Concepts/CRDs/Capture.md                          | 2 +-
 docs/05-Concepts/CRDs/MetricsConfiguration.md             | 2 +-
 docs/05-Concepts/CRDs/RetinaEndpoint.md                   | 2 +-
 operator/cmd/cilium-crds/cells_linux.go                   | 4 ++--
 operator/cmd/root.go                                      | 4 ++--
 operator/cmd/{legacy => standard}/deployment.go           | 6 +++---
 pkg/controllers/daemon/retinaendpoint/suite_test.go       | 2 +-
 pkg/controllers/operator/capture/suite_test.go            | 2 +-
 pkg/monitoragent/monitoragent_linux.go                    | 2 +-
 test/e2e/common/common.go                                 | 2 +-
 test/profiles/localctx/values.yaml                        | 2 +-
 windows/readme.md                                         | 2 +-
 63 files changed, 47 insertions(+), 47 deletions(-)
 rename cmd/{legacy => standard}/daemon.go (99%)
 rename cmd/{legacy => standard}/daemon_linux.go (87%)
 rename cmd/{legacy => standard}/daemon_windows.go (85%)
 delete mode 100755 deploy/legacy/prometheus/retina/create-cm.sh
 rename deploy/{legacy => standard}/grafana/dashboards/clusters.json (100%)
 rename deploy/{legacy => standard}/grafana/dashboards/dns.json (100%)
 rename deploy/{legacy => standard}/grafana/dashboards/pod-level.json (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/.helmignore (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/Chart.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/crds/retina.sh_captures.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/crds/retina.sh_metricsconfigurations.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/crds/retina.sh_retinaendpoints.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/crds/retina.sh_tracesconfigurations.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/NOTES.txt (65%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/_helpers.tpl (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/configmap.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/daemonset.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/networkobserver.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/operator.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/podmonitor.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/rbac.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/service.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/serviceaccount.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/servicemonitor.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/templates/tests/test-connection.yaml (100%)
 rename deploy/{legacy => standard}/manifests/controller/helm/retina/values.yaml (100%)
 rename deploy/{legacy => standard}/prometheus/ama-metrics-settings-configmap.yaml (100%)
 rename deploy/{legacy => standard}/prometheus/collector-config-template.yml (100%)
 rename deploy/{legacy => standard}/prometheus/deploy-retina-clusters.sh (100%)
 rename deploy/{legacy => standard}/prometheus/network-observability/create-cm.sh (71%)
 rename deploy/{legacy => standard}/prometheus/network-observability/network-observability-svc.yaml (100%)
 rename deploy/{legacy => standard}/prometheus/network-observability/prometheus-config (100%)
 rename deploy/{legacy => standard}/prometheus/retina-windows/create-cm.sh (63%)
 rename deploy/{legacy => standard}/prometheus/retina-windows/prometheus-config (100%)
 create mode 100755 deploy/standard/prometheus/retina/create-cm.sh
 rename deploy/{legacy => standard}/prometheus/retina/prometheus-config (100%)
 rename deploy/{legacy => standard}/prometheus/values.yaml (100%)
 rename deploy/{legacy => standard}/registercrd.go (100%)
 rename deploy/{legacy => standard}/registercrd_test.go (100%)
 rename operator/cmd/{legacy => standard}/deployment.go (98%)

diff --git a/.github/workflows/release-charts.yaml b/.github/workflows/release-charts.yaml
index e16ede77f4..730721f595 100644
--- a/.github/workflows/release-charts.yaml
+++ b/.github/workflows/release-charts.yaml
@@ -40,7 +40,7 @@ jobs:
         run: |
           set -euo pipefail
           export TAG=$(make version)
-          helm package ./deploy/legacy/manifests/controller/helm/retina --version $TAG
+          helm package ./deploy/standard/manifests/controller/helm/retina --version $TAG
           # Get Helm chart's SHA digest from helm push cmd output
           helm push retina-$TAG.tgz oci://ghcr.io/${{ github.repository }}/charts >> helm_push_result.txt 2>&1
           cat helm_push_result.txt
diff --git a/Makefile b/Makefile
index 08f8ab0765..ec885bcfac 100644
--- a/Makefile
+++ b/Makefile
@@ -444,7 +444,7 @@ HELM_IMAGE_TAG ?= $(LATEST_TAG)
 
 # basic/node-level mode
 helm-install: manifests
-	helm upgrade --install retina ./deploy/legacy/manifests/controller/helm/retina/ \
+	helm upgrade --install retina ./deploy/standard/manifests/controller/helm/retina/ \
 		--namespace kube-system \
 		--set image.repository=$(IMAGE_REGISTRY)/$(RETINA_IMAGE) \
 		--set image.initRepository=$(IMAGE_REGISTRY)/$(RETINA_INIT_IMAGE) \
@@ -457,7 +457,7 @@ helm-install: manifests
 		--set enabledPlugin_linux="\[dropreason\,packetforward\,linuxutil\,dns\]"
 
 helm-install-with-operator: manifests
-	helm upgrade --install retina ./deploy/legacy/manifests/controller/helm/retina/ \
+	helm upgrade --install retina ./deploy/standard/manifests/controller/helm/retina/ \
 		--namespace kube-system \
 		--set image.repository=$(IMAGE_REGISTRY)/$(RETINA_IMAGE) \
 		--set image.initRepository=$(IMAGE_REGISTRY)/$(RETINA_INIT_IMAGE) \
@@ -474,7 +474,7 @@ helm-install-with-operator: manifests
 
 # advanced/pod-level mode with scale limitations, where metrics are aggregated by source and destination Pod
 helm-install-advanced-remote-context: manifests
-	helm upgrade --install retina ./deploy/legacy/manifests/controller/helm/retina/ \
+	helm upgrade --install retina ./deploy/standard/manifests/controller/helm/retina/ \
 		--namespace kube-system \
 		--set image.repository=$(IMAGE_REGISTRY)/$(RETINA_IMAGE) \
 		--set image.initRepository=$(IMAGE_REGISTRY)/$(RETINA_INIT_IMAGE) \
@@ -493,7 +493,7 @@ helm-install-advanced-remote-context: manifests
 
 # advanced/pod-level mode designed for scale, where metrics are aggregated by "local" Pod (source for outgoing traffic, destination for incoming traffic)
 helm-install-advanced-local-context: manifests
-	helm upgrade --install retina ./deploy/legacy/manifests/controller/helm/retina/ \
+	helm upgrade --install retina ./deploy/standard/manifests/controller/helm/retina/ \
 		--namespace kube-system \
 		--set image.repository=$(IMAGE_REGISTRY)/$(RETINA_IMAGE) \
 		--set image.initRepository=$(IMAGE_REGISTRY)/$(RETINA_INIT_IMAGE) \
diff --git a/cmd/root.go b/cmd/root.go
index 115da29ef0..3f2fef1cff 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/microsoft/retina/cmd/legacy"
+	"github.com/microsoft/retina/cmd/standard"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +28,7 @@ var (
 		RunE: func(cmd *cobra.Command, args []string) error {
 			// Do Stuff Here
 			fmt.Println("Starting Retina Agent")
-			d := legacy.NewDaemon(metricsAddr, probeAddr, cfgFile, enableLeaderElection)
+			d := standard.NewDaemon(metricsAddr, probeAddr, cfgFile, enableLeaderElection)
 			if err := d.Start(); err != nil {
 				return fmt.Errorf("starting daemon: %w", err)
 			}
diff --git a/cmd/legacy/daemon.go b/cmd/standard/daemon.go
similarity index 99%
rename from cmd/legacy/daemon.go
rename to cmd/standard/daemon.go
index 6e06ee73cc..00655444bc 100644
--- a/cmd/legacy/daemon.go
+++ b/cmd/standard/daemon.go
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-package legacy
+package standard
 
 import (
 	"fmt"
diff --git a/cmd/legacy/daemon_linux.go b/cmd/standard/daemon_linux.go
similarity index 87%
rename from cmd/legacy/daemon_linux.go
rename to cmd/standard/daemon_linux.go
index d565110d09..51a47f4fdf 100644
--- a/cmd/legacy/daemon_linux.go
+++ b/cmd/standard/daemon_linux.go
@@ -1,4 +1,4 @@
-package legacy
+package standard
 
 import "github.com/cilium/ebpf/rlimit"
 
diff --git a/cmd/legacy/daemon_windows.go b/cmd/standard/daemon_windows.go
similarity index 85%
rename from cmd/legacy/daemon_windows.go
rename to cmd/standard/daemon_windows.go
index 9e3d302bae..f83cf96589 100644
--- a/cmd/legacy/daemon_windows.go
+++ b/cmd/standard/daemon_windows.go
@@ -1,4 +1,4 @@
-package legacy
+package standard
 
 func (d *Daemon) RemoveMemlock() error {
 	// This function is a no-op on Windows.
diff --git a/crd/Makefile b/crd/Makefile
index 9a2b616108..14299489ad 100644
--- a/crd/Makefile
+++ b/crd/Makefile
@@ -4,7 +4,7 @@ REPO_ROOT = $(shell git rev-parse --show-toplevel)
 TOOLS_DIR = $(REPO_ROOT)/hack/tools
 TOOLS_BIN_DIR = $(TOOLS_DIR)/bin
 CONTROLLER_GEN = $(TOOLS_BIN_DIR)/controller-gen
-HELM_CRD_DIR = $(REPO_ROOT)/deploy/legacy/manifests/controller/helm/retina/crds
+HELM_CRD_DIR = $(REPO_ROOT)/deploy/standard/manifests/controller/helm/retina/crds
 
 .PHONY: generate manifests
 
diff --git a/deploy/legacy/prometheus/retina/create-cm.sh b/deploy/legacy/prometheus/retina/create-cm.sh
deleted file mode 100755
index 873658fc60..0000000000
--- a/deploy/legacy/prometheus/retina/create-cm.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/legacy/prometheus/retina/prometheus-config -n kube-system 
diff --git a/deploy/legacy/grafana/dashboards/clusters.json b/deploy/standard/grafana/dashboards/clusters.json
similarity index 100%
rename from deploy/legacy/grafana/dashboards/clusters.json
rename to deploy/standard/grafana/dashboards/clusters.json
diff --git a/deploy/legacy/grafana/dashboards/dns.json b/deploy/standard/grafana/dashboards/dns.json
similarity index 100%
rename from deploy/legacy/grafana/dashboards/dns.json
rename to deploy/standard/grafana/dashboards/dns.json
diff --git a/deploy/legacy/grafana/dashboards/pod-level.json b/deploy/standard/grafana/dashboards/pod-level.json
similarity index 100%
rename from deploy/legacy/grafana/dashboards/pod-level.json
rename to deploy/standard/grafana/dashboards/pod-level.json
diff --git a/deploy/legacy/manifests/controller/helm/retina/.helmignore b/deploy/standard/manifests/controller/helm/retina/.helmignore
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/.helmignore
rename to deploy/standard/manifests/controller/helm/retina/.helmignore
diff --git a/deploy/legacy/manifests/controller/helm/retina/Chart.yaml b/deploy/standard/manifests/controller/helm/retina/Chart.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/Chart.yaml
rename to deploy/standard/manifests/controller/helm/retina/Chart.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_captures.yaml b/deploy/standard/manifests/controller/helm/retina/crds/retina.sh_captures.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_captures.yaml
rename to deploy/standard/manifests/controller/helm/retina/crds/retina.sh_captures.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_metricsconfigurations.yaml b/deploy/standard/manifests/controller/helm/retina/crds/retina.sh_metricsconfigurations.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_metricsconfigurations.yaml
rename to deploy/standard/manifests/controller/helm/retina/crds/retina.sh_metricsconfigurations.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_retinaendpoints.yaml b/deploy/standard/manifests/controller/helm/retina/crds/retina.sh_retinaendpoints.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_retinaendpoints.yaml
rename to deploy/standard/manifests/controller/helm/retina/crds/retina.sh_retinaendpoints.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_tracesconfigurations.yaml b/deploy/standard/manifests/controller/helm/retina/crds/retina.sh_tracesconfigurations.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_tracesconfigurations.yaml
rename to deploy/standard/manifests/controller/helm/retina/crds/retina.sh_tracesconfigurations.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/NOTES.txt b/deploy/standard/manifests/controller/helm/retina/templates/NOTES.txt
similarity index 65%
rename from deploy/legacy/manifests/controller/helm/retina/templates/NOTES.txt
rename to deploy/standard/manifests/controller/helm/retina/templates/NOTES.txt
index 46dfb7e9a3..eee2598dd4 100644
--- a/deploy/legacy/manifests/controller/helm/retina/templates/NOTES.txt
+++ b/deploy/standard/manifests/controller/helm/retina/templates/NOTES.txt
@@ -1,3 +1,3 @@
-1. Installing retina service using helm: helm install retina ./deploy/legacy/manifests/controller/helm/retina/ --namespace kube-system --dependency-update
+1. Installing retina service using helm: helm install retina ./deploy/standard/manifests/controller/helm/retina/ --namespace kube-system --dependency-update
 2. Cleaning up/uninstalling/deleting retina and dependencies related: 
   helm uninstall retina -n kube-system
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/_helpers.tpl b/deploy/standard/manifests/controller/helm/retina/templates/_helpers.tpl
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/_helpers.tpl
rename to deploy/standard/manifests/controller/helm/retina/templates/_helpers.tpl
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/configmap.yaml b/deploy/standard/manifests/controller/helm/retina/templates/configmap.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/configmap.yaml
rename to deploy/standard/manifests/controller/helm/retina/templates/configmap.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/daemonset.yaml b/deploy/standard/manifests/controller/helm/retina/templates/daemonset.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/daemonset.yaml
rename to deploy/standard/manifests/controller/helm/retina/templates/daemonset.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/networkobserver.yaml b/deploy/standard/manifests/controller/helm/retina/templates/networkobserver.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/networkobserver.yaml
rename to deploy/standard/manifests/controller/helm/retina/templates/networkobserver.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/operator.yaml b/deploy/standard/manifests/controller/helm/retina/templates/operator.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/operator.yaml
rename to deploy/standard/manifests/controller/helm/retina/templates/operator.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/podmonitor.yaml b/deploy/standard/manifests/controller/helm/retina/templates/podmonitor.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/podmonitor.yaml
rename to deploy/standard/manifests/controller/helm/retina/templates/podmonitor.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/rbac.yaml b/deploy/standard/manifests/controller/helm/retina/templates/rbac.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/rbac.yaml
rename to deploy/standard/manifests/controller/helm/retina/templates/rbac.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/service.yaml b/deploy/standard/manifests/controller/helm/retina/templates/service.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/service.yaml
rename to deploy/standard/manifests/controller/helm/retina/templates/service.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/serviceaccount.yaml b/deploy/standard/manifests/controller/helm/retina/templates/serviceaccount.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/serviceaccount.yaml
rename to deploy/standard/manifests/controller/helm/retina/templates/serviceaccount.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/servicemonitor.yaml b/deploy/standard/manifests/controller/helm/retina/templates/servicemonitor.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/servicemonitor.yaml
rename to deploy/standard/manifests/controller/helm/retina/templates/servicemonitor.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/templates/tests/test-connection.yaml b/deploy/standard/manifests/controller/helm/retina/templates/tests/test-connection.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/templates/tests/test-connection.yaml
rename to deploy/standard/manifests/controller/helm/retina/templates/tests/test-connection.yaml
diff --git a/deploy/legacy/manifests/controller/helm/retina/values.yaml b/deploy/standard/manifests/controller/helm/retina/values.yaml
similarity index 100%
rename from deploy/legacy/manifests/controller/helm/retina/values.yaml
rename to deploy/standard/manifests/controller/helm/retina/values.yaml
diff --git a/deploy/legacy/prometheus/ama-metrics-settings-configmap.yaml b/deploy/standard/prometheus/ama-metrics-settings-configmap.yaml
similarity index 100%
rename from deploy/legacy/prometheus/ama-metrics-settings-configmap.yaml
rename to deploy/standard/prometheus/ama-metrics-settings-configmap.yaml
diff --git a/deploy/legacy/prometheus/collector-config-template.yml b/deploy/standard/prometheus/collector-config-template.yml
similarity index 100%
rename from deploy/legacy/prometheus/collector-config-template.yml
rename to deploy/standard/prometheus/collector-config-template.yml
diff --git a/deploy/legacy/prometheus/deploy-retina-clusters.sh b/deploy/standard/prometheus/deploy-retina-clusters.sh
similarity index 100%
rename from deploy/legacy/prometheus/deploy-retina-clusters.sh
rename to deploy/standard/prometheus/deploy-retina-clusters.sh
diff --git a/deploy/legacy/prometheus/network-observability/create-cm.sh b/deploy/standard/prometheus/network-observability/create-cm.sh
similarity index 71%
rename from deploy/legacy/prometheus/network-observability/create-cm.sh
rename to deploy/standard/prometheus/network-observability/create-cm.sh
index cc93571a63..d21f5625d1 100755
--- a/deploy/legacy/prometheus/network-observability/create-cm.sh
+++ b/deploy/standard/prometheus/network-observability/create-cm.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 kubectl delete cm ama-metrics-prometheus-config-node  -n kube-system 
-kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/legacy/prometheus/cilium/prometheus-config -n kube-system 
+kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/standard/prometheus/cilium/prometheus-config -n kube-system 
 k rollout restart ds ama-metrics-node -n kube-system
diff --git a/deploy/legacy/prometheus/network-observability/network-observability-svc.yaml b/deploy/standard/prometheus/network-observability/network-observability-svc.yaml
similarity index 100%
rename from deploy/legacy/prometheus/network-observability/network-observability-svc.yaml
rename to deploy/standard/prometheus/network-observability/network-observability-svc.yaml
diff --git a/deploy/legacy/prometheus/network-observability/prometheus-config b/deploy/standard/prometheus/network-observability/prometheus-config
similarity index 100%
rename from deploy/legacy/prometheus/network-observability/prometheus-config
rename to deploy/standard/prometheus/network-observability/prometheus-config
diff --git a/deploy/legacy/prometheus/retina-windows/create-cm.sh b/deploy/standard/prometheus/retina-windows/create-cm.sh
similarity index 63%
rename from deploy/legacy/prometheus/retina-windows/create-cm.sh
rename to deploy/standard/prometheus/retina-windows/create-cm.sh
index 347d9315e2..cc32d764e7 100755
--- a/deploy/legacy/prometheus/retina-windows/create-cm.sh
+++ b/deploy/standard/prometheus/retina-windows/create-cm.sh
@@ -2,4 +2,4 @@
 
 kubectl delete cm ama-metrics-prometheus-config-node  -n kube-system 
 
-kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/legacy/prometheus/retina-windows/prometheus-config -n kube-system 
+kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/standard/prometheus/retina-windows/prometheus-config -n kube-system 
diff --git a/deploy/legacy/prometheus/retina-windows/prometheus-config b/deploy/standard/prometheus/retina-windows/prometheus-config
similarity index 100%
rename from deploy/legacy/prometheus/retina-windows/prometheus-config
rename to deploy/standard/prometheus/retina-windows/prometheus-config
diff --git a/deploy/standard/prometheus/retina/create-cm.sh b/deploy/standard/prometheus/retina/create-cm.sh
new file mode 100755
index 0000000000..0fb1d0e482
--- /dev/null
+++ b/deploy/standard/prometheus/retina/create-cm.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+kubectl create configmap ama-metrics-prometheus-config-node --from-file=./deploy/standard/prometheus/retina/prometheus-config -n kube-system 
diff --git a/deploy/legacy/prometheus/retina/prometheus-config b/deploy/standard/prometheus/retina/prometheus-config
similarity index 100%
rename from deploy/legacy/prometheus/retina/prometheus-config
rename to deploy/standard/prometheus/retina/prometheus-config
diff --git a/deploy/legacy/prometheus/values.yaml b/deploy/standard/prometheus/values.yaml
similarity index 100%
rename from deploy/legacy/prometheus/values.yaml
rename to deploy/standard/prometheus/values.yaml
diff --git a/deploy/legacy/registercrd.go b/deploy/standard/registercrd.go
similarity index 100%
rename from deploy/legacy/registercrd.go
rename to deploy/standard/registercrd.go
diff --git a/deploy/legacy/registercrd_test.go b/deploy/standard/registercrd_test.go
similarity index 100%
rename from deploy/legacy/registercrd_test.go
rename to deploy/standard/registercrd_test.go
diff --git a/docs/02-Installation/01-Setup.md b/docs/02-Installation/01-Setup.md
index b8ef93514e..a194e8c6ea 100644
--- a/docs/02-Installation/01-Setup.md
+++ b/docs/02-Installation/01-Setup.md
@@ -14,9 +14,9 @@ Note: you can also run captures with just the [CLI](./02-CLI.md).
 
 The installation of Retina can be configured using different control planes and modes.
 
-You can choose between the "legacy" control plane (the original implementation of Retina) and Hubble.
+You can choose between the "Standard" control plane (the original implementation of Retina) and Hubble.
 
-If the "legacy" control plane is chosen, different modes are available. The available metric dimensions depend on the selected mode. For an explanation of the available modes, see [Legacy Metric Modes](../03-Metrics/modes/modes.md).
+If the "Standard" control plane is chosen, different modes are available. The available metric dimensions depend on the selected mode. For an explanation of the available modes, see [Standard Metric Modes](../03-Metrics/modes/modes.md).
 
 Modes are not applicable to the Hubble control plane. For metrics related to the Hubble control plane, refer to the [Hubble metrics](../03-Metrics/02-hubble_metrics.md) documentation.
 
diff --git a/docs/02-Installation/03-Config.md b/docs/02-Installation/03-Config.md
index 799d25ad1b..68776ff6f3 100644
--- a/docs/02-Installation/03-Config.md
+++ b/docs/02-Installation/03-Config.md
@@ -4,7 +4,7 @@
 
 ### Default Configuration
 
-Default settings for each component are specified in [Values file](../../deploy/legacy/manifests/controller/helm/retina/values.yaml).
+Default settings for each component are specified in [Values file](../../deploy/standard/manifests/controller/helm/retina/values.yaml).
 
 ### Deployed Configuration
 
diff --git a/docs/02-Installation/04-prometheus.md b/docs/02-Installation/04-prometheus.md
index bebabb90b6..fd7f52212c 100644
--- a/docs/02-Installation/04-prometheus.md
+++ b/docs/02-Installation/04-prometheus.md
@@ -6,7 +6,7 @@ Prometheus is an open-source system monitoring and alerting toolkit originally b
 
 1. Create a Kubernetes cluster.
 2. Install Retina DaemonSet (see [Quick Installation](./01-Setup.md)).
-3. Clone [Retina Repository](https://github.com/microsoft/retina) or download [Prometheus Values File](../../deploy/legacy/prometheus/values.yaml).
+3. Clone [Retina Repository](https://github.com/microsoft/retina) or download [Prometheus Values File](../../deploy/standard/prometheus/values.yaml).
 
 ## Install Prometheus via Helm
 
@@ -21,7 +21,7 @@ Prometheus is an open-source system monitoring and alerting toolkit originally b
 
   ```shell
   # The value of VALUE_FILE_PATH is relative to the repo root folder. Update this according to the location of your file.
-  VALUE_FILE_PATH=deploy/legacy/prometheus/values.yaml
+  VALUE_FILE_PATH=deploy/standard/prometheus/values.yaml
   helm install prometheus -n kube-system -f $VALUE_FILE_PATH prometheus-community/kube-prometheus-stack
   ```
 
@@ -29,7 +29,7 @@ Prometheus is an open-source system monitoring and alerting toolkit originally b
 
   ```shell
   # The value of VALUE_FILE_PATH is relative to the repo root folder. Update this according to the location of your file.
-  VALUE_FILE_PATH=deploy/legacy/prometheus/values.yaml
+  VALUE_FILE_PATH=deploy/standard/prometheus/values.yaml
   helm upgrade prometheus -n kube-system -f $VALUE_FILE_PATH prometheus-community/kube-prometheus-stack
   ```
 
diff --git a/docs/02-Installation/05-grafana.md b/docs/02-Installation/05-grafana.md
index 82b5b0e7a0..1f476b7525 100644
--- a/docs/02-Installation/05-grafana.md
+++ b/docs/02-Installation/05-grafana.md
@@ -44,7 +44,7 @@ If you followed the steps to install and configure [Prometheus](./04-prometheus.
 
 ## Retina Dashboards
 
-There is a set of Retina dashboards that you can import directly into Grafana as json files. The dashboards are found under `deploy/legacy/grafana/dashboards/` if you installed retina legacy controlplane, and under `deploy/hubble/grafana/dashboards/` if you installed retina hubble controlplane.
+There is a set of Retina dashboards that you can import directly into Grafana as json files. The dashboards are found under `deploy/standard/grafana/dashboards/` if you installed retina standard controlplane, and under `deploy/hubble/grafana/dashboards/` if you installed retina hubble controlplane.
 
 Here is an example of the Retina `dns.json` dashboard.
 
diff --git a/docs/02-Installation/aks-setup.md b/docs/02-Installation/aks-setup.md
index d62902d641..df9fb9affe 100644
--- a/docs/02-Installation/aks-setup.md
+++ b/docs/02-Installation/aks-setup.md
@@ -15,4 +15,4 @@
 8. Push to container registry:
 `docker push <container-registry-url>/retina:<TAG>`
 9. Installing retina onto the cluster -
-`helm install retina <retina-repository-path>/deploy/legacy/manifests/controller/helm/retina/ --create-namespace --namespace retina --dependency-update`
+`helm install retina <retina-repository-path>/deploy/standard/manifests/controller/helm/retina/ --create-namespace --namespace retina --dependency-update`
diff --git a/docs/03-Metrics/01-metrics-intro.md b/docs/03-Metrics/01-metrics-intro.md
index ea2a05bba9..48d1c717b2 100644
--- a/docs/03-Metrics/01-metrics-intro.md
+++ b/docs/03-Metrics/01-metrics-intro.md
@@ -4,9 +4,9 @@ Prometheus metrics available depend on the Retina control plane deployed.
 
 ## Control Planes
 
-There are two control planes used in the Retina project: Hubble and the legacy control plane. Both control planes create metrics and traces which are generated by the eBPF data plane, which has a single implementation. Only one control plane should be deployed at a given time. Helm charts for the deployment are found under `deploy/hubble/manifests/controller/helm/retina` and `deploy/legacy/manifests/controller/helm/retina`.
+There are two control planes used in the Retina project: Hubble and the Standard control plane. Both control planes create metrics and traces which are generated by the eBPF data plane, which has a single implementation. Only one control plane should be deployed at a given time. Helm charts for the deployment are found under `deploy/hubble/manifests/controller/helm/retina` and `deploy/standard/manifests/controller/helm/retina`.
 
 1. [Hubble metrics](./02-hubble_metrics.md)
-2. [Legacy metrics](./modes/modes.md)
+2. [Standard metrics](./modes/modes.md)
 
-> Note: Hubble offers additional features and metrics that the legacy control plane does not support. The plan is to deprecate the legacy control plane in favor of Hubble. For further documentation on Hubble, check [Cilium/Hubble repository](https://github.com/cilium/hubble/?tab=readme-ov-file#features) and official [Hubble metrics documentation](https://docs.cilium.io/en/stable/observability/metrics/#hubble-metrics)
+> Note: Hubble offers additional features and metrics that the Standard control plane does not support. The plan is to deprecate the Standard control plane in favor of Hubble. For further documentation on Hubble, check [Cilium/Hubble repository](https://github.com/cilium/hubble/?tab=readme-ov-file#features) and official [Hubble metrics documentation](https://docs.cilium.io/en/stable/observability/metrics/#hubble-metrics)
diff --git a/docs/03-Metrics/modes/modes.md b/docs/03-Metrics/modes/modes.md
index a19dba64a8..ce2d3a4b00 100644
--- a/docs/03-Metrics/modes/modes.md
+++ b/docs/03-Metrics/modes/modes.md
@@ -1,7 +1,7 @@
 ---
 sidebar_position: 2
 ---
-# Legacy Metric Modes
+# Standard Metric Modes
 
 Retina provides **three modes** with their own metrics and scale capabilities.
 Each mode is **fully customizable** (only create the metrics/labels you need).
diff --git a/docs/04-Captures/03-managed-storage-account.md b/docs/04-Captures/03-managed-storage-account.md
index c8f4a3fb5f..11c5edca14 100644
--- a/docs/04-Captures/03-managed-storage-account.md
+++ b/docs/04-Captures/03-managed-storage-account.md
@@ -22,7 +22,7 @@ SUBSCRIPTION_ID=""
 RESOURCE_GROUP_NAME=""
 REGION=""
 MSI_CLIENT_ID=""
-helm upgrade --install retina ./deploy/legacy/manifests/controller/helm/retina/ \
+helm upgrade --install retina ./deploy/standard/manifests/controller/helm/retina/ \
   --set operator.enabled=true \
   --set capture.enableManagedStorageAccount=true \
   --set capture.tenantId=$TENANT_ID \
@@ -68,7 +68,7 @@ data:
   azureCredentialConfig: /etc/kubernetes/cloud-config/azure.json
 ```
 
-In the above configuration, when `enableManagedStorageAccount` is true, retina-operator will pick azure credential configuration from `/etc/kubernetes/cloud-config/azure.json`. [retina-operator helm template](https://github.com/microsoft/retina/blob/main/deploy/legacy/manifests/controller/helm/retina/templates/operator.yaml) mounts the secret containing azure credentials to `/etc/kubernetes/cloud-config/azure.json`.
+In the above configuration, when `enableManagedStorageAccount` is true, retina-operator will pick azure credential configuration from `/etc/kubernetes/cloud-config/azure.json`. [retina-operator helm template](https://github.com/microsoft/retina/blob/main/deploy/standard/manifests/controller/helm/retina/templates/operator.yaml) mounts the secret containing azure credentials to `/etc/kubernetes/cloud-config/azure.json`.
 
 When default storage account is enabled, a managed storage account will be created under the resource group of the sub both specified in the credential file.
 In the case of AKS, the resource group will be MC, or node, resource group, and subscription will be the overlay subscription.
diff --git a/docs/05-Concepts/CRDs/Capture.md b/docs/05-Concepts/CRDs/Capture.md
index 4ebeabfca2..89b97dd5ff 100644
--- a/docs/05-Concepts/CRDs/Capture.md
+++ b/docs/05-Concepts/CRDs/Capture.md
@@ -9,7 +9,7 @@ To use the `Capture` CRD, [install Retina](../../02-Installation/01-Setup.md) wi
 
 ## CRD Specification
 
-The full specification for the `Capture` CRD can be found in the [Capture CRD](https://github.com/microsoft/retina/blob/main/deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_captures.yaml) file.
+The full specification for the `Capture` CRD can be found in the [Capture CRD](https://github.com/microsoft/retina/blob/main/deploy/standard/manifests/controller/helm/retina/crds/retina.sh_captures.yaml) file.
 
 The `Capture` CRD is defined with the following specifications:
 
diff --git a/docs/05-Concepts/CRDs/MetricsConfiguration.md b/docs/05-Concepts/CRDs/MetricsConfiguration.md
index 3e6815ec35..44c2307b4f 100644
--- a/docs/05-Concepts/CRDs/MetricsConfiguration.md
+++ b/docs/05-Concepts/CRDs/MetricsConfiguration.md
@@ -6,7 +6,7 @@ Retina by default emits node level metrics, however, customers can apply `Metric
 
 ## CRD Specification
 
-The full specification for the `MetricsConfiguration` CRD can be found in the [MetricsConfiguration CRD](https://github.com/microsoft/retina/blob/main/deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_metricsconfigurations.yaml) file.
+The full specification for the `MetricsConfiguration` CRD can be found in the [MetricsConfiguration CRD](https://github.com/microsoft/retina/blob/main/deploy/standard/manifests/controller/helm/retina/crds/retina.sh_metricsconfigurations.yaml) file.
 
 The `MetricsConfiguration` CRD is defined with the following specifications:
 
diff --git a/docs/05-Concepts/CRDs/RetinaEndpoint.md b/docs/05-Concepts/CRDs/RetinaEndpoint.md
index 7f24d78a7d..43006833a9 100644
--- a/docs/05-Concepts/CRDs/RetinaEndpoint.md
+++ b/docs/05-Concepts/CRDs/RetinaEndpoint.md
@@ -8,7 +8,7 @@ In large-scale API servers, each Retina Pod needs to learn about cluster state,
 
 ## CRD Specification
 
-The full specification for the `RetinaEndpoint` CRD can be found in the [RetinaEndpoint CRD]( https://github.com/microsoft/retina/blob/main/deploy/legacy/manifests/controller/helm/retina/crds/retina.sh_retinaendpoints.yaml) file.
+The full specification for the `RetinaEndpoint` CRD can be found in the [RetinaEndpoint CRD]( https://github.com/microsoft/retina/blob/main/deploy/standard/manifests/controller/helm/retina/crds/retina.sh_retinaendpoints.yaml) file.
 
 The `RetinaEndpoint` CRD is defined with the following specifications:
 
diff --git a/operator/cmd/cilium-crds/cells_linux.go b/operator/cmd/cilium-crds/cells_linux.go
index f0d6c80e6f..1b2d011f4e 100644
--- a/operator/cmd/cilium-crds/cells_linux.go
+++ b/operator/cmd/cilium-crds/cells_linux.go
@@ -90,7 +90,7 @@ var (
 		// Provides Clientset, API for accessing Kubernetes objects.
 		k8sClient.Cell,
 
-		// Provides the modular metrics registry, metric HTTP server and legacy metrics cell.
+		// Provides the modular metrics registry, metric HTTP server and standard metrics cell.
 		// NOTE: no server/metrics are created when --enable-metrics=false (default)
 		operatorMetrics.Cell,
 		cell.Provide(func(
@@ -175,7 +175,7 @@ var (
 		// 	isLeader.Load,
 		// ),
 
-		// NOTE: might need to uncomment to support metrics? Code might be legacy though?
+		// NOTE: might need to uncomment to support metrics? Code might be standard though?
 		// api.MetricsHandlerCell,
 
 		controller.Cell,
diff --git a/operator/cmd/root.go b/operator/cmd/root.go
index f689f12909..f7c79c3540 100644
--- a/operator/cmd/root.go
+++ b/operator/cmd/root.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/microsoft/retina/operator/cmd/legacy"
+	"github.com/microsoft/retina/operator/cmd/standard"
 	"github.com/spf13/cobra"
 )
 
@@ -27,7 +27,7 @@ var (
 		Long:  "Start Retina Operator",
 		Run: func(cmd *cobra.Command, args []string) {
 			fmt.Println("Starting Retina Operator")
-			d := legacy.NewOperator(metricsAddr, probeAddr, cfgFile, enableLeaderElection)
+			d := standard.NewOperator(metricsAddr, probeAddr, cfgFile, enableLeaderElection)
 			d.Start()
 		},
 	}
diff --git a/operator/cmd/legacy/deployment.go b/operator/cmd/standard/deployment.go
similarity index 98%
rename from operator/cmd/legacy/deployment.go
rename to operator/cmd/standard/deployment.go
index 41a060b485..1371643d4e 100644
--- a/operator/cmd/legacy/deployment.go
+++ b/operator/cmd/standard/deployment.go
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-package legacy
+package standard
 
 import (
 	"context"
@@ -29,7 +29,7 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	retinav1alpha1 "github.com/microsoft/retina/crd/api/v1alpha1"
-	deploy "github.com/microsoft/retina/deploy/legacy"
+	deploy "github.com/microsoft/retina/deploy/standard"
 	"github.com/microsoft/retina/internal/buildinfo"
 	"github.com/microsoft/retina/operator/cache"
 	config "github.com/microsoft/retina/operator/config"
@@ -84,7 +84,7 @@ func NewOperator(metricsAddr, probeAddr, configFile string, enableLeaderElection
 func (o *Operator) Start() {
 	mainLogger = log.Logger().Named("main")
 
-	mainLogger.Sugar().Infof("Starting legacy operator")
+	mainLogger.Sugar().Infof("Starting standard operator")
 
 	opts := &crzap.Options{
 		Development: false,
diff --git a/pkg/controllers/daemon/retinaendpoint/suite_test.go b/pkg/controllers/daemon/retinaendpoint/suite_test.go
index 54bc4bafbd..fbb29e5c22 100644
--- a/pkg/controllers/daemon/retinaendpoint/suite_test.go
+++ b/pkg/controllers/daemon/retinaendpoint/suite_test.go
@@ -54,7 +54,7 @@ var _ = BeforeSuite(func() {
 
 	By("Bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "..", "deploy", "legacy", "manifests", "controller", "helm", "retina", "crds")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "..", "deploy", "standard", "manifests", "controller", "helm", "retina", "crds")},
 		ErrorIfCRDPathMissing: true,
 	}
 
diff --git a/pkg/controllers/operator/capture/suite_test.go b/pkg/controllers/operator/capture/suite_test.go
index 1030639e74..25c01a08ef 100644
--- a/pkg/controllers/operator/capture/suite_test.go
+++ b/pkg/controllers/operator/capture/suite_test.go
@@ -48,7 +48,7 @@ var _ = BeforeSuite(func() {
 
 	By("Bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "..", "deploy", "legacy", "manifests", "controller", "helm", "retina", "crds")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "..", "deploy", "standard", "manifests", "controller", "helm", "retina", "crds")},
 		ErrorIfCRDPathMissing: true,
 	}
 
diff --git a/pkg/monitoragent/monitoragent_linux.go b/pkg/monitoragent/monitoragent_linux.go
index 8a16addcf5..757e4a9ac1 100644
--- a/pkg/monitoragent/monitoragent_linux.go
+++ b/pkg/monitoragent/monitoragent_linux.go
@@ -71,7 +71,7 @@ func (a *monitorAgent) SendEvent(typ int, event interface{}) error {
 		return nil
 	}
 
-	// marshal notifications into JSON format for legacy listeners
+	// marshal notifications into JSON format for standard listeners
 	if typ == api.MessageTypeAgent {
 		msg, ok := event.(api.AgentNotifyMessage)
 		if !ok {
diff --git a/test/e2e/common/common.go b/test/e2e/common/common.go
index 473dfc83f8..1d4f5b00a2 100644
--- a/test/e2e/common/common.go
+++ b/test/e2e/common/common.go
@@ -39,7 +39,7 @@ var (
 
 var (
 	RetinaChartPath = func(rootDir string) string {
-		return filepath.Join(rootDir, "deploy", "legacy", "manifests", "controller", "helm", "retina")
+		return filepath.Join(rootDir, "deploy", "standard", "manifests", "controller", "helm", "retina")
 	}
 	RetinaAdvancedProfilePath = func(rootDir string) string {
 		return filepath.Join(rootDir, "test", "profiles", "advanced", "values.yaml")
diff --git a/test/profiles/localctx/values.yaml b/test/profiles/localctx/values.yaml
index 6da54adc44..b1ef109c08 100644
--- a/test/profiles/localctx/values.yaml
+++ b/test/profiles/localctx/values.yaml
@@ -1,6 +1,6 @@
 operator:
   enabled: false
-# Plugins will default to deploy/legacy/manifests/controller/helm/retina/values.yaml
+# Plugins will default to deploy/standard/manifests/controller/helm/retina/values.yaml
 # TODO add all plugins that we want to test here for local context.
 remoteContext: false
 enablePodLevel: true
diff --git a/windows/readme.md b/windows/readme.md
index 8b7fefef8f..ca0d8f14d4 100644
--- a/windows/readme.md
+++ b/windows/readme.md
@@ -3,7 +3,7 @@
 1. Cordon all windows nodes. Until the below selector is added, needed so helm install isn't blocked.
 2. Install Linux Retina helm chart.
 
-    `helm install retina ./deploy/legacy/manifests/controller/helm/retina/ --namespace kube-system`
+    `helm install retina ./deploy/standard/manifests/controller/helm/retina/ --namespace kube-system`
 
 3. Uncordon the Windows and nodes.