diff --git a/apps/buffgym/buffgym-exercise.js b/apps/buffgym/buffgym-exercise.js
index 68e49be84..078e206de 100644
--- a/apps/buffgym/buffgym-exercise.js
+++ b/apps/buffgym/buffgym-exercise.js
@@ -1,16 +1,16 @@
 exports = class Exercise {
   constructor(params) {
+    this.completed = false;
+    this.sets = [];
     this.title = params.title;
     this.weight = params.weight;
     this.unit = params.unit;
     this.restPeriod = params.restPeriod;
-    this.completed = false;
-    this.sets = [];
+    this._originalRestPeriod = params.restPeriod;
+    this._weightIncrement = params.weightIncrement;
     this._restTimeout = null;
     this._restInterval = null;
     this._state = null;
-    this._originalRestPeriod = params.restPeriod;
-    this._weightIncrement = params.weightIncrement || 2.5;
   }
 
   get humanTitle() {
@@ -63,13 +63,13 @@ exports = class Exercise {
     return (targetRepsTotalSum - completedRepsTotalSum) === 0;
   }
 
-  startRestTimer(program) {
+  startRestTimer(workout) {
     this._restTimeout = setTimeout(() => {
-      this.next(program);
+      this.next(workout);
     }, 1000 * this.restPeriod);
 
     this._restInterval = setInterval(() => {
-      program.emit("redraw");
+      workout.emit("redraw");
     }, 1000 );
   }
 
@@ -85,28 +85,28 @@ exports = class Exercise {
     return this._restTimeout != null;
   }
 
-  setupStartedButtons(program) {
+  setupStartedButtons(workout) {
     clearWatch();
 
     setWatch(() => {
       this.currentSet().incReps();
-      program.emit("redraw");
+      workout.emit("redraw");
     }, BTN1, {repeat: true});
 
-    setWatch(program.next.bind(program), BTN2, {repeat: false});
+    setWatch(workout.next.bind(workout), BTN2, {repeat: false});
 
     setWatch(() => {
       this.currentSet().decReps();
-      program.emit("redraw");
+      workout.emit("redraw");
     }, BTN3, {repeat: true});
   }
 
-  setupRestingButtons(program) {
+  setupRestingButtons(workout) {
     clearWatch();
-    setWatch(program.next.bind(program), BTN2, {repeat: false});
+    setWatch(workout.next.bind(workout), BTN2, {repeat: false});
   }
 
-  next(program) {
+  next(workout) {
     const STARTED = 1;
     const RESTING = 2;
     const COMPLETED = 3;
@@ -114,12 +114,12 @@ exports = class Exercise {
     switch(this._state) {
       case null:
         this._state = STARTED;
-        this.setupStartedButtons(program);
+        this.setupStartedButtons(workout);
         break;
       case STARTED:
         this._state = RESTING;
-        this.startRestTimer(program);
-        this.setupRestingButtons(program);
+        this.startRestTimer(workout);
+        this.setupRestingButtons(workout);
         break;
       case RESTING:
         this.resetRestTimer();
@@ -132,13 +132,13 @@ exports = class Exercise {
           this._state = null;
         }
         // As we are changing state and require it to be reprocessed
-        // invoke the next step of program
-        program.next();
+        // invoke the next step of workout
+        workout.next();
         break;
       default:
         throw "Exercise: Attempting to move to an unknown state";
     }
 
-    program.emit("redraw");
+    workout.emit("redraw");
   }
 }
\ No newline at end of file
diff --git a/apps/buffgym/buffgym-program-index.json b/apps/buffgym/buffgym-program-index.json
deleted file mode 100644
index 3bb51f1b5..000000000
--- a/apps/buffgym/buffgym-program-index.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-    {
-        "title": "Program A",
-        "file": "buffgym-program-a.json"
-    },
-    {
-        "title": "Program B",
-        "file": "buffgym-program-b.json"
-    }
-]
\ No newline at end of file
diff --git a/apps/buffgym/buffgym-set.js b/apps/buffgym/buffgym-set.js
index 4bd12d7ec..dc0c05671 100644
--- a/apps/buffgym/buffgym-set.js
+++ b/apps/buffgym/buffgym-set.js
@@ -1,9 +1,9 @@
 exports = class Set {
   constructor(maxReps) {
-    this.minReps = 0;
-    this.maxReps = maxReps;
-    this.reps = 0;
     this.completed = false;
+    this.minReps = 0;
+    this.reps = 0;
+    this.maxReps = maxReps;
   }
 
   isCompleted() {
diff --git a/apps/buffgym/buffgym-program-a.json b/apps/buffgym/buffgym-workout-a.json
similarity index 96%
rename from apps/buffgym/buffgym-program-a.json
rename to apps/buffgym/buffgym-workout-a.json
index 7ebaf3741..8eb8611d6 100644
--- a/apps/buffgym/buffgym-program-a.json
+++ b/apps/buffgym/buffgym-workout-a.json
@@ -1,5 +1,5 @@
 {
-    "title": "Program A",
+    "title": "Workout A",
     "exercises": [
         {
             "title": "Squats",
diff --git a/apps/buffgym/buffgym-program-b.json b/apps/buffgym/buffgym-workout-b.json
similarity index 96%
rename from apps/buffgym/buffgym-program-b.json
rename to apps/buffgym/buffgym-workout-b.json
index b93348621..43845a98b 100644
--- a/apps/buffgym/buffgym-program-b.json
+++ b/apps/buffgym/buffgym-workout-b.json
@@ -1,5 +1,5 @@
 {
-    "title": "Program B",
+    "title": "Workout B",
     "exercises": [
         {
             "title": "Squats",
diff --git a/apps/buffgym/buffgym-workout-index.json b/apps/buffgym/buffgym-workout-index.json
new file mode 100644
index 000000000..af74d5e3b
--- /dev/null
+++ b/apps/buffgym/buffgym-workout-index.json
@@ -0,0 +1,10 @@
+[
+    {
+        "title": "Workout A",
+        "file": "buffgym-workout-a.json"
+    },
+    {
+        "title": "Workout B",
+        "file": "buffgym-workout-b.json"
+    }
+]
\ No newline at end of file
diff --git a/apps/buffgym/buffgym-program.js b/apps/buffgym/buffgym-workout.js
similarity index 95%
rename from apps/buffgym/buffgym-program.js
rename to apps/buffgym/buffgym-workout.js
index 68a069da5..811125293 100644
--- a/apps/buffgym/buffgym-program.js
+++ b/apps/buffgym/buffgym-workout.js
@@ -1,4 +1,4 @@
-exports = class Program {
+exports = class Workout {
   constructor(params) {
     this.title = params.title;
     this.exercises = [];
@@ -27,6 +27,10 @@ exports = class Program {
     return !!this.completed;
   }
 
+  static fromJSON(workout) {
+
+  }
+
   toJSON() {
     return {
       title: this.title,
diff --git a/apps/buffgym/buffgym.app.js b/apps/buffgym/buffgym.app.js
index 4dc6ffd5a..b92b2bb98 100755
--- a/apps/buffgym/buffgym.app.js
+++ b/apps/buffgym/buffgym.app.js
@@ -5,7 +5,7 @@
  * Created: April 2020
  *
  * Inspired by:
- * - Stronglifts 5x5 training program https://stronglifts.com/5x5/
+ * - Stronglifts 5x5 training workout https://stronglifts.com/5x5/
  * - Stronglifts smart watch app
  */
 
@@ -66,10 +66,10 @@ function drawSet(exercise) {
   g.flip();
 }
 
-function drawProgDone() {
+function drawWorkoutDone() {
   const title1 = "You did";
   const title2 = "GREAT!";
-  const msg = "That's the program\ncompleted. Now eat\nsome food and\nget plenty of rest.";
+  const msg = "That's the workout\ncompleted. Now eat\nsome food and\nget plenty of rest.";
 
   clearWatch();
   setWatch(Bangle.showLauncher, BTN2, {repeat: false});
@@ -102,13 +102,13 @@ function drawSetComp() {
   g.flip();
 }
 
-function drawRestTimer(program) {
-  const exercise = program.currentExercise();
+function drawRestTimer(workout) {
+  const exercise = workout.currentExercise();
   const motivation = "Take a breather..";
 
   if (exercise.restPeriod <= 0) {
     exercise.resetRestTimer();
-    program.next();
+    workout.next();
 
     return;
   }
@@ -128,21 +128,21 @@ function drawRestTimer(program) {
   exercise.decRestPeriod();
 }
 
-function redraw(program) {
-  const exercise = program.currentExercise();
+function redraw(workout) {
+  const exercise = workout.currentExercise();
   g.clear();
 
-  if (program.isCompleted()) {
-    saveProg(program);
-    drawProgDone(program);
+  if (workout.isCompleted()) {
+    saveWorkout(workout);
+    drawWorkoutDone(workout);
     return;
   }
 
   if (exercise.isRestTimerRunning()) {
     if (exercise.isLastSet()) {
-      drawSetComp(program);
+      drawSetComp(workout);
     } else {
-      drawRestTimer(program);
+      drawRestTimer(workout);
     }
 
     return;
@@ -151,7 +151,7 @@ function redraw(program) {
   drawSet(exercise);
 }
 
-function drawProgMenu(programs, selProgIdx) {
+function drawWorkoutMenu(workouts, selWorkoutIdx) {
   g.clear();
   g.setFontAlign(0, -1);
   g.setColor(WHITE);
@@ -160,16 +160,16 @@ function drawProgMenu(programs, selProgIdx) {
 
   g.setFont("6x8", 1);
   g.setFontAlign(-1, -1);
-  let selectedProgram = programs[selProgIdx].title;
+  let selectedWorkout = workouts[selWorkoutIdx].title;
   let yPos = 50;
-  programs.forEach(program => {
+  workouts.forEach(workout => {
     g.setColor("#f05a56");
     g.fillRect(0, yPos, W, yPos + 11);
     g.setColor("#ffffff");
-    if (selectedProgram === program.title) {
+    if (selectedWorkout === workout.title) {
       g.drawRect(0, yPos, W - 1, yPos + 11);
     }
-    g.drawString(program.title, 10, yPos + 2);
+    g.drawString(workout.title, 10, yPos + 2);
     yPos += 15;
   });
   g.flip();
@@ -177,25 +177,25 @@ function drawProgMenu(programs, selProgIdx) {
 
 function setupMenu() {
   clearWatch();
-  const progs = getProgIndex();
-  let selProgIdx = 0;
-  drawProgMenu(progs, selProgIdx);
+  const workouts = getWorkoutIndex();
+  let selWorkoutIdx = 0;
+  drawWorkoutMenu(workouts, selWorkoutIdx);
 
   setWatch(()=>{
-    selProgIdx--;
-    if (selProgIdx< 0) selProgIdx = 0;
-    drawProgMenu(progs, selProgIdx);
+    selWorkoutIdx--;
+    if (selWorkoutIdx< 0) selWorkoutIdx = 0;
+    drawWorkoutMenu(workouts, selWorkoutIdx);
   }, BTN1, {repeat: true});
 
   setWatch(()=>{
-    const prog = buildProg(progs[selProgIdx].file);
-    prog.next();
+    const workout = buildWorkout(workouts[selWorkoutIdx].file);
+    workout.next();
   }, BTN2, {repeat: false});
 
   setWatch(()=>{
-    selProgIdx++;
-    if (selProgIdx > progs.length - 1) selProgIdx = progs.length - 1;
-    drawProgMenu(progs, selProgIdx);
+    selWorkoutIdx++;
+    if (selWorkoutIdx > workouts.length - 1) selWorkoutIdx = workouts.length - 1;
+    drawWorkoutMenu(workouts, selWorkoutIdx);
   }, BTN3, {repeat: true});
 }
 
@@ -249,23 +249,24 @@ function drawSplash() {
   }, BTN3, {repeat: false});
 }
 
-function getProgIndex() {
-  const progIdx = require("Storage").readJSON("buffgym-program-index.json");
-  return progIdx;
+function getWorkoutIndex() {
+  const workoutIdx = require("Storage").readJSON("buffgym-workout-index.json");
+  return workoutIdx;
 }
 
-function buildProg(fName) {
+function buildWorkout(fName) {
   const Set = require("buffgym-set.js");
   const Exercise = require("buffgym-exercise.js");
-  const Program = require("buffgym-program.js");
-  const progJSON = require("Storage").readJSON(fName);
-  const prog = new Program({
-    title: progJSON.title,
+  const Workout = require("buffgym-workout.js");
+  const workoutJSON = require("Storage").readJSON(fName);
+  const workout = new Workout({
+    title: workoutJSON.title,
   });
-  const exercises = progJSON.exercises.map(exerciseJSON => {
+  const exercises = workoutJSON.exercises.map(exerciseJSON => {
     const exercise = new Exercise({
       title: exerciseJSON.title,
       weight: exerciseJSON.weight,
+      weightIncrement: exerciseJSON.weightIncrement,
       unit: exerciseJSON.unit,
       restPeriod: exerciseJSON.restPeriod,
     });
@@ -275,14 +276,14 @@ function buildProg(fName) {
 
     return exercise;
   });
-  prog.addExercises(exercises);
+  workout.addExercises(exercises);
 
-  return prog;
+  return workout;
 }
 
-function saveProg(program) {
-  const fName = getProgIndex().find(prog => prog.title === program.title).file;
-  require("Storage").writeJSON(fName, program.toJSON());
+function saveWorkout(workout) {
+  const fName = getWorkoutIndex().find(workout => workout.title === workout.title).file;
+  require("Storage").writeJSON(fName, workout.toJSON());
 }
 
 drawSplash();
\ No newline at end of file