diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
index a010ff1..b285430 100644
--- a/.github/workflows/action.yml
+++ b/.github/workflows/action.yml
@@ -64,8 +64,8 @@ jobs:
       - name: Build and push (adapter)
         uses: docker/build-push-action@v4
         with:
-          context: ./docker/datasource
-          file: ./docker/datasource/Dockerfile
+          context: ./docker/adapter
+          file: ./docker/adapter/Dockerfile
           push: true
           tags: |
             sjultra/pewpew-adapter:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index a6dd72a..9ff85e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       context: .
       dockerfile: ./docker/Dockerfile
     volumes:
-      - ./docker/datasource/data:/opt/pewpew/data
+      - ./docker/adapter/data:/opt/pewpew/data
     ports:
       - 8080:8080
     restart: unless-stopped
diff --git a/docker/datasource/Dockerfile b/docker/datasource/Dockerfile
index 71e5f88..5db046e 100644
--- a/docker/datasource/Dockerfile
+++ b/docker/datasource/Dockerfile
@@ -1,7 +1,7 @@
 FROM node:latest
 
 EXPOSE 8090
-WORKDIR /datasource
+WORKDIR /adapter
 COPY . .
 RUN npm install --include-dev
 
diff --git a/docker/datasource/package.json b/docker/datasource/package.json
index 7481483..3533ba8 100644
--- a/docker/datasource/package.json
+++ b/docker/datasource/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "pewpew-datasource",
+  "name": "pewpew-adapter",
   "version": "1.0.0",
-  "description": "An adapter to pewpew to load a datasource",
+  "description": "An adapter for pewpew to load an external datasource",
   "main": "./src/index.ts",
   "scripts": {
     "trace": "ts-node ./src/index.ts"
diff --git a/helm/service/templates/datasource.yaml b/helm/service/templates/adapter.yaml
similarity index 80%
rename from helm/service/templates/datasource.yaml
rename to helm/service/templates/adapter.yaml
index af3d669..040aadc 100644
--- a/helm/service/templates/datasource.yaml
+++ b/helm/service/templates/adapter.yaml
@@ -1,27 +1,27 @@
 apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
-  name: datasource
+  name: adapter
 spec:
-  schedule: {{ .Values.datasource.schedule }}
+  schedule: {{ .Values.adapter.schedule }}
   successfulJobsHistoryLimit: 0
   jobTemplate:
     spec:
       selector:
         matchLabels:
-          app: datasource
+          app: adapter
       template:
         metadata:
           labels:
-            app: datasource
+            app: adapter
         spec:       
           containers:
-            - name: datasource
-              image: "{{ .Values.datasource.image }}:{{ .Values.datasource.tag }}"
+            - name: adapter
+              image: "{{ .Values.adapter.image }}:{{ .Values.adapter.tag }}"
 
               volumeMounts:
                 - name: {{ .Values.adapter.name }}
-                  mountPath: /datasource/data
+                  mountPath: /adapter/data
               # args:
               #   - sh
               #   - -c