diff --git a/declarative/app-of-apps/circle-app.yml b/declarative/app-of-apps/heliocentric-app.yml
similarity index 100%
rename from declarative/app-of-apps/circle-app.yml
rename to declarative/app-of-apps/heliocentric-app.yml
diff --git a/declarative/app-of-apps/square-app.yml b/declarative/app-of-apps/heliocentric-no-pluto-app.yml
similarity index 75%
rename from declarative/app-of-apps/square-app.yml
rename to declarative/app-of-apps/heliocentric-no-pluto-app.yml
index cafecb0..da878d1 100644
--- a/declarative/app-of-apps/square-app.yml
+++ b/declarative/app-of-apps/heliocentric-no-pluto-app.yml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: square-app
+  name: heliocentric-model-no-pluto-app
   namespace: argocd
   finalizers:
     - resources-finalizer.argocd.argoproj.io
@@ -11,11 +11,11 @@ spec:
   source:
     repoURL: https://github.com/sidd-harth/test-cd.git
     targetRevision: HEAD
-    path: ./declarative/manifests/square
+    path: ./declarative/manifests/heliocentric-model-no-pluto
    
   destination:
     server: https://kubernetes.default.svc
-    namespace: square
+    namespace: heliocentric-no-pluto
 
   syncPolicy:
     syncOptions:
diff --git a/declarative/manifests/circle/deployment.yml b/declarative/manifests/circle/deployment.yml
deleted file mode 100644
index 7ef9f2d..0000000
--- a/declarative/manifests/circle/deployment.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: infinite-circle
-spec:
-  selector:
-    matchLabels:
-      app: infinite-circle
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: infinite-circle
-    spec:
-      containers:
-      - name: infinite-circle
-        image: siddharth67/infinite-shapes:circle
diff --git a/declarative/manifests/geocentric-model/deployment.yml b/declarative/manifests/geocentric-model/deployment.yml
index d8b4706..15de8b8 100644
--- a/declarative/manifests/geocentric-model/deployment.yml
+++ b/declarative/manifests/geocentric-model/deployment.yml
@@ -14,4 +14,4 @@ spec:
     spec:
       containers:
       - name: geocentric-model
-        image: siddharth67/geocentric-model:earth
+        image: siddharth67/geocentric-solar-system:v1
diff --git a/declarative/manifests/heliocentric-model-no-pluto/deployment.yml b/declarative/manifests/heliocentric-model-no-pluto/deployment.yml
new file mode 100644
index 0000000..dc83d2c
--- /dev/null
+++ b/declarative/manifests/heliocentric-model-no-pluto/deployment.yml
@@ -0,0 +1,17 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: heliocentric-model-no-pluto
+spec:
+  selector:
+    matchLabels:
+      app: heliocentric-model-no-pluto
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: heliocentric-model-no-pluto
+    spec:
+      containers:
+      - name: heliocentric-model-no-pluto
+        image: siddharth67/heliocentric-solar-system:no-pluto
diff --git a/declarative/manifests/circle/service.yml b/declarative/manifests/heliocentric-model-no-pluto/service.yml
similarity index 63%
rename from declarative/manifests/circle/service.yml
rename to declarative/manifests/heliocentric-model-no-pluto/service.yml
index ed4ca6e..22b784a 100644
--- a/declarative/manifests/circle/service.yml
+++ b/declarative/manifests/heliocentric-model-no-pluto/service.yml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: infinite-circle-svc
+  name: heliocentric-model-no-pluto-svc
 spec:
   ports:
   - port: 80
     protocol: TCP
     targetPort: 80
   selector:
-    app: infinite-circle
+    app: heliocentric-model-no-pluto
   type: NodePort
diff --git a/declarative/manifests/heliocentric-model/deployment.yml b/declarative/manifests/heliocentric-model/deployment.yml
new file mode 100644
index 0000000..b2b935d
--- /dev/null
+++ b/declarative/manifests/heliocentric-model/deployment.yml
@@ -0,0 +1,17 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: heliocentric-model
+spec:
+  selector:
+    matchLabels:
+      app: heliocentric-model
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: heliocentric-model
+    spec:
+      containers:
+      - name: heliocentric-model
+        image: siddharth67/heliocentric-solar-system:v1
diff --git a/declarative/manifests/square/service.yml b/declarative/manifests/heliocentric-model/service.yml
similarity index 69%
rename from declarative/manifests/square/service.yml
rename to declarative/manifests/heliocentric-model/service.yml
index 1c1fbb9..7f7d834 100644
--- a/declarative/manifests/square/service.yml
+++ b/declarative/manifests/heliocentric-model/service.yml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: infinite-squares-svc
+  name: heliocentric-model-svc
 spec:
   ports:
   - port: 80
     protocol: TCP
     targetPort: 80
   selector:
-    app: infinite-squares
+    app: heliocentric-model
   type: NodePort
diff --git a/declarative/manifests/square/deployment.yml b/declarative/manifests/square/deployment.yml
deleted file mode 100644
index cfd74e5..0000000
--- a/declarative/manifests/square/deployment.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: infinite-squares
-spec:
-  selector:
-    matchLabels:
-      app: infinite-squares
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: infinite-squares
-    spec:
-      containers:
-      - name: infinite-squares
-        image: siddharth67/infinite-shapes:squares