diff --git a/def/task.go b/def/task.go
index 973021f..f5092de 100644
--- a/def/task.go
+++ b/def/task.go
@@ -1,8 +1,8 @@
 package def
 
 import (
-	"bitbucket.org/sunybingcloud/electron/constants"
-	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
+	"bitbucket.org/sunybingcloud/elektron/constants"
+	"bitbucket.org/sunybingcloud/elektron/utilities/offerUtils"
 	"encoding/json"
 	mesos "github.com/mesos/mesos-go/mesosproto"
 	"github.com/pkg/errors"
diff --git a/pcp/logAndProgressiveExtrema.go b/pcp/logAndProgressiveExtrema.go
index 4a2cf56..2b48f95 100644
--- a/pcp/logAndProgressiveExtrema.go
+++ b/pcp/logAndProgressiveExtrema.go
@@ -1,9 +1,9 @@
 package pcp
 
 import (
-	"bitbucket.org/sunybingcloud/electron/constants"
-	"bitbucket.org/sunybingcloud/electron/rapl"
-	"bitbucket.org/sunybingcloud/electron/utilities"
+	"bitbucket.org/sunybingcloud/elektron/constants"
+	"bitbucket.org/sunybingcloud/elektron/rapl"
+	"bitbucket.org/sunybingcloud/elektron/utilities"
 	"bufio"
 	"container/ring"
 	"log"
diff --git a/pcp/loganddynamiccap.go b/pcp/loganddynamiccap.go
index f692e5f..09dc435 100644
--- a/pcp/loganddynamiccap.go
+++ b/pcp/loganddynamiccap.go
@@ -1,7 +1,7 @@
 package pcp
 
 import (
-	"bitbucket.org/sunybingcloud/electron/rapl"
+	"bitbucket.org/sunybingcloud/elektron/rapl"
 	"bufio"
 	"container/ring"
 	"log"
diff --git a/powerCapping/proactiveclusterwidecappers.go b/powerCapping/proactiveclusterwidecappers.go
deleted file mode 100644
index 9088b29..0000000
--- a/powerCapping/proactiveclusterwidecappers.go
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-Cluster wide dynamic capping
-
-This is a capping strategy that can be used with schedulers to improve the power consumption.
-
-Note: This capping strategy doesn't currently consider task.Watts to power class mapping when classMapWatts is enabled.
-*/
-package powerCapping
-
-import (
-	"bitbucket.org/sunybingcloud/electron/constants"
-	"bitbucket.org/sunybingcloud/electron/def"
-	"bitbucket.org/sunybingcloud/electron/utilities/runAvg"
-	"errors"
-	"github.com/montanaflynn/stats"
-	"log"
-	"sort"
-)
-
-// wrapper around def.Task that implements runAvg.Interface
-type taskWrapper struct {
-	task def.Task
-}
-
-func (tw taskWrapper) Val() float64 {
-	return tw.task.Watts * constants.Tolerance
-}
-
-func (tw taskWrapper) ID() string {
-	return tw.task.TaskID
-}
-
-// Cluster wide capper
-type ClusterwideCapper struct{}
-
-// Defining constructor for clusterwideCapper. Please don't call this directly and instead use GetClusterwideCapperInstance()
-func newClusterwideCapper() *ClusterwideCapper {
-	return &ClusterwideCapper{}
-}
-
-// Singleton instance of clusterwideCapper
-var singletonCapper *ClusterwideCapper
-
-// Retrieve the singleton instance of clusterwideCapper.
-func GetClusterwideCapperInstance() *ClusterwideCapper {
-	if singletonCapper == nil {
-		singletonCapper = newClusterwideCapper()
-	} else {
-		// Do nothing
-	}
-	return singletonCapper
-}
-
-// Clear and initialize the runAvg calculator
-func (capper ClusterwideCapper) clear() {
-	runAvg.Init()
-}
-
-/*
-Calculating cap value.
-
-1. Sorting the values of ratios ((running average/totalPower) per node) in ascending order.
-2. Computing the median of above sorted values.
-3. The median is now the cap.
-*/
-func (capper ClusterwideCapper) getCap(ratios map[string]float64) float64 {
-	var values []float64
-	// Validation
-	if ratios == nil {
-		return 100.0
-	}
-	for _, apower := range ratios {
-		values = append(values, apower)
-	}
-	// sorting the values in ascending order.
-	sort.Float64s(values)
-	// Calculating the median
-	if median, err := stats.Median(values); err == nil {
-		return median
-	}
-	// should never reach here. If here, then just setting the cap value to be 100
-	return 100.0
-}
-
-/*
-A Recapping strategy which decides between 2 different Recapping schemes.
-1. the regular scheme based on the average power usage across the cluster.
-2. A scheme based on the average of the loads on each node in the cluster.
-
-The Recap value picked the least among the two.
-
-The CleverRecap scheme works well when the cluster is relatively idle and until then,
-	the primitive Recapping scheme works better.
-*/
-func (capper ClusterwideCapper) CleverRecap(totalPower map[string]float64,
-	taskMonitor map[string][]def.Task, finishedTaskId string) (float64, error) {
-	// Validation
-	if totalPower == nil || taskMonitor == nil {
-		return 100.0, errors.New("Invalid argument: totalPower, taskMonitor")
-	}
-
-	// determining the Recap value by calling the regular Recap(...)
-	toggle := false
-	RecapValue, err := capper.NaiveRecap(totalPower, taskMonitor, finishedTaskId)
-	if err == nil {
-		toggle = true
-	}
-
-	// watts usage on each node in the cluster.
-	wattsUsages := make(map[string][]float64)
-	hostOfFinishedTask := ""
-	indexOfFinishedTask := -1
-	for host, _ := range constants.Hosts {
-		wattsUsages[host] = []float64{0.0}
-	}
-	for host, tasks := range taskMonitor {
-		for i, task := range tasks {
-			if task.TaskID == finishedTaskId {
-				hostOfFinishedTask = host
-				indexOfFinishedTask = i
-				// Not considering this task for the computation of totalAllocatedPower and totalRunningTasks
-				continue
-			}
-			wattsUsages[host] = append(wattsUsages[host], float64(task.Watts)*constants.Tolerance)
-		}
-	}
-
-	// Updating task monitor. If Recap(...) has deleted the finished task from the taskMonitor,
-	// then this will be ignored. Else (this is only when an error occured with Recap(...)), we remove it here.
-	if hostOfFinishedTask != "" && indexOfFinishedTask != -1 {
-		log.Printf("Removing task with task [%s] from the list of running tasks\n",
-			taskMonitor[hostOfFinishedTask][indexOfFinishedTask].TaskID)
-		taskMonitor[hostOfFinishedTask] = append(taskMonitor[hostOfFinishedTask][:indexOfFinishedTask],
-			taskMonitor[hostOfFinishedTask][indexOfFinishedTask+1:]...)
-	}
-
-	// Need to check whether there are still tasks running on the cluster. If not then we return an error.
-	clusterIdle := true
-	for _, tasks := range taskMonitor {
-		if len(tasks) > 0 {
-			clusterIdle = false
-		}
-	}
-
-	if !clusterIdle {
-		// load on each node in the cluster.
-		loads := []float64{0.0}
-		for host, usages := range wattsUsages {
-			totalUsage := 0.0
-			for _, usage := range usages {
-				totalUsage += usage
-			}
-			loads = append(loads, totalUsage/totalPower[host])
-		}
-
-		// Now need to compute the average load.
-		totalLoad := 0.0
-		for _, load := range loads {
-			totalLoad += load
-		}
-		averageLoad := (totalLoad / float64(len(loads)) * 100.0) // this would be the cap value.
-		// If toggle is true, then we need to return the least Recap value.
-		if toggle {
-			if averageLoad <= RecapValue {
-				return averageLoad, nil
-			} else {
-				return RecapValue, nil
-			}
-		} else {
-			return averageLoad, nil
-		}
-	}
-	return 100.0, errors.New("No task running on the cluster.")
-}
-
-/*
-Recapping the entire cluster.
-
-1. Remove the task that finished from the list of running tasks.
-2. Compute the average allocated power of each of the tasks that are currently running.
-3. For each host, determine the ratio of the average to the total power.
-4. Determine the median of the ratios and this would be the new cluster wide cap.
-
-This needs to be called whenever a task finishes execution.
-*/
-func (capper ClusterwideCapper) NaiveRecap(totalPower map[string]float64,
-	taskMonitor map[string][]def.Task, finishedTaskId string) (float64, error) {
-	// Validation
-	if totalPower == nil || taskMonitor == nil {
-		return 100.0, errors.New("Invalid argument: totalPower, taskMonitor")
-	}
-	totalAllocatedPower := 0.0
-	totalRunningTasks := 0
-
-	hostOfFinishedTask := ""
-	indexOfFinishedTask := -1
-	for host, tasks := range taskMonitor {
-		for i, task := range tasks {
-			if task.TaskID == finishedTaskId {
-				hostOfFinishedTask = host
-				indexOfFinishedTask = i
-				// Not considering this task for the computation of totalAllocatedPower and totalRunningTasks
-				continue
-			}
-			totalAllocatedPower += (float64(task.Watts) * constants.Tolerance)
-			totalRunningTasks++
-		}
-	}
-
-	// Updating task monitor
-	if hostOfFinishedTask != "" && indexOfFinishedTask != -1 {
-		log.Printf("Removing task with task [%s] from the list of running tasks\n",
-			taskMonitor[hostOfFinishedTask][indexOfFinishedTask].TaskID)
-		taskMonitor[hostOfFinishedTask] = append(taskMonitor[hostOfFinishedTask][:indexOfFinishedTask],
-			taskMonitor[hostOfFinishedTask][indexOfFinishedTask+1:]...)
-	}
-
-	// For the last task, totalAllocatedPower and totalRunningTasks would be 0
-	if totalAllocatedPower == 0 && totalRunningTasks == 0 {
-		return 100, errors.New("No task running on the cluster.")
-	}
-
-	average := totalAllocatedPower / float64(totalRunningTasks)
-	ratios := []float64{}
-	for _, tpower := range totalPower {
-		ratios = append(ratios, (average/tpower)*100)
-	}
-	sort.Float64s(ratios)
-	median, err := stats.Median(ratios)
-	if err == nil {
-		return median, nil
-	} else {
-		return 100, err
-	}
-}
-
-/*
-Remove entry for finished task from the window
-
-This  function is called when a task completes.
-This completed task needs to be removed from the window of tasks (if it is still present)
-	so that it doesn't contribute to the computation of the next cap value.
-*/
-func (capper ClusterwideCapper) TaskFinished(taskID string) {
-	runAvg.Remove(taskID)
-}
-
-// First come first serve scheduling.
-func (capper ClusterwideCapper) FCFSDeterminedCap(totalPower map[string]float64, newTask *def.Task) (float64, error) {
-	// Validation
-	if totalPower == nil {
-		return 100, errors.New("Invalid argument: totalPower")
-	} else {
-		// Need to calculate the running average
-		runningAverage := runAvg.Calc(taskWrapper{task: *newTask}, constants.ConsiderationWindowSize)
-		// For each node, calculate the percentage of the running average to the total power.
-		ratios := make(map[string]float64)
-		for host, tpower := range totalPower {
-			if tpower >= runningAverage {
-				ratios[host] = (runningAverage / tpower) * 100
-			} else {
-				// We don't consider this host for the computation of the cluster wide cap.
-			}
-		}
-
-		// Determine the cluster wide cap value.
-		capValue := capper.getCap(ratios)
-		// Need to cap the cluster to this value.
-		return capValue, nil
-	}
-}
-
-// Stringer for an instance of clusterwideCapper
-func (capper ClusterwideCapper) String() string {
-	return "Cluster-wide Capper -- Proactively cap the entire cluster."
-}
diff --git a/scheduler.go b/scheduler.go
index 1eca3b4..36e0924 100644
--- a/scheduler.go
+++ b/scheduler.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"bitbucket.org/sunybingcloud/electron/def"
-	"bitbucket.org/sunybingcloud/electron/pcp"
-	"bitbucket.org/sunybingcloud/electron/schedulers"
+	"bitbucket.org/sunybingcloud/elektron/def"
+	"bitbucket.org/sunybingcloud/elektron/pcp"
+	"bitbucket.org/sunybingcloud/elektron/schedulers"
 	"flag"
 	"fmt"
 	"github.com/golang/protobuf/proto"
diff --git a/schedulers/base.go b/schedulers/base.go
index 099559e..62a4b9b 100644
--- a/schedulers/base.go
+++ b/schedulers/base.go
@@ -1,7 +1,7 @@
 package schedulers
 
 import (
-	"bitbucket.org/sunybingcloud/electron/def"
+	"bitbucket.org/sunybingcloud/elektron/def"
 	mesos "github.com/mesos/mesos-go/mesosproto"
 	sched "github.com/mesos/mesos-go/scheduler"
 	"log"
diff --git a/schedulers/bin-packing.go b/schedulers/bin-packing.go
index f0c69fa..630413b 100644
--- a/schedulers/bin-packing.go
+++ b/schedulers/bin-packing.go
@@ -1,9 +1,9 @@
 package schedulers
 
 import (
-	"bitbucket.org/sunybingcloud/electron/def"
-	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
-	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
+	"bitbucket.org/sunybingcloud/elektron/def"
+	"bitbucket.org/sunybingcloud/elektron/utilities/mesosUtils"
+	"bitbucket.org/sunybingcloud/elektron/utilities/offerUtils"
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	mesos "github.com/mesos/mesos-go/mesosproto"
@@ -38,7 +38,7 @@ type BinPackSortedWatts struct {
 	base // Type embedded to inherit common functions
 }
 
-// New electron scheduler
+// New elektron scheduler
 func NewBinPackSortedWatts(tasks []def.Task, wattsAsAResource bool, schedTracePrefix string, classMapWatts bool) *BinPackSortedWatts {
 	sort.Sort(def.WattsSorter(tasks))
 
@@ -99,7 +99,7 @@ func (s *BinPackSortedWatts) newTask(offer *mesos.Offer, task def.Task) *mesos.T
 	return &mesos.TaskInfo{
 		Name: proto.String(taskName),
 		TaskId: &mesos.TaskID{
-			Value: proto.String("electron-" + taskName),
+			Value: proto.String("elektron-" + taskName),
 		},
 		SlaveId:   offer.SlaveId,
 		Resources: resources,
diff --git a/schedulers/first-fit.go b/schedulers/first-fit.go
index db59e24..7894b5d 100644
--- a/schedulers/first-fit.go
+++ b/schedulers/first-fit.go
@@ -1,9 +1,9 @@
 package schedulers
 
 import (
-	"bitbucket.org/sunybingcloud/electron/def"
-	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
-	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
+	"bitbucket.org/sunybingcloud/elektron/def"
+	"bitbucket.org/sunybingcloud/elektron/utilities/mesosUtils"
+	"bitbucket.org/sunybingcloud/elektron/utilities/offerUtils"
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	mesos "github.com/mesos/mesos-go/mesosproto"
@@ -33,12 +33,12 @@ func (s *FirstFit) takeOffer(offer *mesos.Offer, task def.Task) bool {
 	return false
 }
 
-// electronScheduler implements the Scheduler interface
+// elektronScheduler implements the Scheduler interface
 type FirstFit struct {
 	base // Type embedded to inherit common functions
 }
 
-// New electron scheduler
+// New elektron scheduler
 func NewFirstFit(tasks []def.Task, wattsAsAResource bool, schedTracePrefix string, classMapWatts bool) *FirstFit {
 
 	logFile, err := os.Create("./" + schedTracePrefix + "_schedTrace.log")
@@ -98,7 +98,7 @@ func (s *FirstFit) newTask(offer *mesos.Offer, task def.Task) *mesos.TaskInfo {
 	return &mesos.TaskInfo{
 		Name: proto.String(taskName),
 		TaskId: &mesos.TaskID{
-			Value: proto.String("electron-" + taskName),
+			Value: proto.String("elektron-" + taskName),
 		},
 		SlaveId:   offer.SlaveId,
 		Resources: resources,
diff --git a/schedulers/helpers.go b/schedulers/helpers.go
index 1e39c20..b7c5563 100644
--- a/schedulers/helpers.go
+++ b/schedulers/helpers.go
@@ -1,7 +1,7 @@
 package schedulers
 
 import (
-	"bitbucket.org/sunybingcloud/electron/constants"
+	"bitbucket.org/sunybingcloud/elektron/constants"
 	"fmt"
 	"log"
 )
diff --git a/schedulers/max-greedymins.go b/schedulers/max-greedymins.go
index 60a80ee..a2545db 100644
--- a/schedulers/max-greedymins.go
+++ b/schedulers/max-greedymins.go
@@ -1,9 +1,9 @@
 package schedulers
 
 import (
-	"bitbucket.org/sunybingcloud/electron/def"
-	"bitbucket.org/sunybingcloud/electron/utilities/mesosUtils"
-	"bitbucket.org/sunybingcloud/electron/utilities/offerUtils"
+	"bitbucket.org/sunybingcloud/elektron/def"
+	"bitbucket.org/sunybingcloud/elektron/utilities/mesosUtils"
+	"bitbucket.org/sunybingcloud/elektron/utilities/offerUtils"
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	mesos "github.com/mesos/mesos-go/mesosproto"
@@ -39,7 +39,7 @@ type BPSWMaxMinWatts struct {
 	base //Type embedding to inherit common functions
 }
 
-// New electron scheduler
+// New elektron scheduler
 func NewBPSWMaxMinWatts(tasks []def.Task, wattsAsAResource bool, schedTracePrefix string, classMapWatts bool) *BPSWMaxMinWatts {
 	sort.Sort(def.WattsSorter(tasks))
 
@@ -101,7 +101,7 @@ func (s *BPSWMaxMinWatts) newTask(offer *mesos.Offer, task def.Task) *mesos.Task
 	return &mesos.TaskInfo{
 		Name: proto.String(taskName),
 		TaskId: &mesos.TaskID{
-			Value: proto.String("electron-" + taskName),
+			Value: proto.String("elektron-" + taskName),
 		},
 		SlaveId:   offer.SlaveId,
 		Resources: resources,
diff --git a/utilities/offerUtils/offerUtils.go b/utilities/offerUtils/offerUtils.go
index 7651b98..fba0add 100644
--- a/utilities/offerUtils/offerUtils.go
+++ b/utilities/offerUtils/offerUtils.go
@@ -1,7 +1,7 @@
 package offerUtils
 
 import (
-	"bitbucket.org/sunybingcloud/electron/constants"
+	"bitbucket.org/sunybingcloud/elektron/constants"
 	mesos "github.com/mesos/mesos-go/mesosproto"
 	"log"
 	"strings"