diff --git a/frontend/www/goal.html b/frontend/www/goal.html
index 8ab73f9f05a5843af0bc8125590cf91cc53a8068..c481b25be7769eec50ac61c86f6a3b1f522c02a0 100644
--- a/frontend/www/goal.html
+++ b/frontend/www/goal.html
@@ -19,7 +19,7 @@
       <h3 class="mt-3">Create/Edit Goal</h3>
     </div>
   </div>
-  <form class="row g-3" id="form-exercise">
+  <form class="row g-3" id="form-goal">
     <div class="col-lg-6 ">
       <label for="inputName" class="form-label">Goal</label>
       <input type="text" class="form-control" id="inputName" name="name" >
@@ -42,9 +42,9 @@
     </div>
     <div class="col-lg-6"></div>
     <div class="col-lg-6">
-      <input type="button" class="btn btn-primary " id="btn-ok-exercise" value="  UPDATE  ">
-      <input type="button" class="btn btn-secondary " id="btn-cancel-exercise" value="Cancel">
-      <input type="button" class="btn btn-danger float-end " id="btn-delete-exercise" value="Delete">
+      <input type="button" class="btn btn-primary " id="btn-ok-goal" value="  UPDATE  ">
+      <input type="button" class="btn btn-secondary " id="btn-cancel-goal" value="Cancel">
+      <input type="button" class="btn btn-danger float-end " id="btn-delete-goal" value="Delete">
     </div>
     <div class="col-lg-6">
 
diff --git a/frontend/www/scripts/goal.js b/frontend/www/scripts/goal.js
index a97ffca89d9993968cf53451d53e350f8c233690..14afd3289c8ac038cc6a4ada76f8089e0a601c2a 100644
--- a/frontend/www/scripts/goal.js
+++ b/frontend/www/scripts/goal.js
@@ -9,17 +9,15 @@ function handleCancelButtonDuringCreate() {
     window.location.replace("goals.html");
 }
 
-async function createExercise() {
+async function createGoal() {
 
-    let form = document.querySelector("#form-exercise");
+    let form = document.querySelector("#form-goal");
     let formData = new FormData(form);
     let body = {"name": formData.get("name"),
                 "description": formData.get("description"),
                 "date": formData.get("date"),
                 "exercise": formData.get("exercise")};
 
-    console.log("HEELO", body)
-
       let response = await sendRequest("POST", `${HOST}/api/goal/`, body);
 
       if (response.ok) {
@@ -37,7 +35,7 @@ async function deleteExercise(id) {
     let response = await sendRequest("DELETE", `${HOST}/api/goal/${id}/`);
     if (!response.ok) {
         let data = await response.json();
-        let alert = createAlert(`Could not delete exercise ${id}`, data);
+        let alert = createAlert(`Could not delete goal ${id}`, data);
         document.body.prepend(alert);
     } else {
         window.location.replace("goals.html");
@@ -51,11 +49,11 @@ async function retrieveGoal(id) {
 
     if (!response.ok) {
         let data = await response.json();
-        let alert = createAlert("Could not retrieve exercise data!", data);
+        let alert = createAlert("Could not retrieve goal data!", data);
         document.body.prepend(alert);
     } else {
         let goalData = await response.json();
-        let form = document.querySelector("#form-exercise");
+        let form = document.querySelector("#form-goal");
         let formData = new FormData(form);
 
         for (let key of formData.keys()) {
@@ -77,7 +75,7 @@ async function retrieveGoal(id) {
 }
 
 async function updateExercise(id) {
-    let form = document.querySelector("#form-exercise");
+    let form = document.querySelector("#form-goal");
     let formData = new FormData(form);
 
     let muscleGroupSelector = document.querySelector("select")
@@ -93,7 +91,7 @@ async function updateExercise(id) {
 
     if (!response.ok) {
         let data = await response.json();
-        let alert = createAlert(`Could not update exercise ${id}`, data);
+        let alert = createAlert(`Could not update goal ${id}`, data);
         document.body.prepend(alert);
     } else {
         console.log(response)
@@ -103,7 +101,7 @@ async function updateExercise(id) {
 }
 
 const init = async () => {
-    let coachContainer = document.getElementById('exercise-content');
+    let goalContainer = document.getElementById('exercise-content');
     await sendRequest("GET", `${HOST}/api/exercises/`).then(async (val) => {
         val.json().then((resp) => {
             resp.results.forEach(workout => {
@@ -120,7 +118,7 @@ const init = async () => {
                         newOption.textContent = workout.name;
                     }
 
-                    coachContainer.appendChild(newOption);
+                    goalContainer.appendChild(newOption);
                 }
             });
         })
@@ -131,9 +129,9 @@ const init = async () => {
 window.addEventListener("DOMContentLoaded", async () => {
     await init();
 
-    cancelButton = document.querySelector("#btn-cancel-exercise");
-    okButton = document.querySelector("#btn-ok-exercise");
-    deleteButton = document.querySelector("#btn-delete-exercise");
+    cancelButton = document.querySelector("#btn-cancel-goal");
+    okButton = document.querySelector("#btn-ok-goal");
+    deleteButton = document.querySelector("#btn-delete-goal");
     oldFormData = null;
 
     const urlParams = new URLSearchParams(window.location.search);
@@ -152,7 +150,7 @@ window.addEventListener("DOMContentLoaded", async () => {
         cancelButton.className = cancelButton.className += "hide";
         deleteButton.className = deleteButton.className += "hide";
 
-        okButton.addEventListener("click", async () => await createExercise());
+        okButton.addEventListener("click", async () => await createGoal());
     }
 
 });