diff --git a/POCpp.xcodeproj/project.xcworkspace/xcuserdata/patrickjmcd.xcuserdatad/UserInterfaceState.xcuserstate b/POCpp.xcodeproj/project.xcworkspace/xcuserdata/patrickjmcd.xcuserdatad/UserInterfaceState.xcuserstate
index b2786a6..13357af 100644
Binary files a/POCpp.xcodeproj/project.xcworkspace/xcuserdata/patrickjmcd.xcuserdatad/UserInterfaceState.xcuserstate and b/POCpp.xcodeproj/project.xcworkspace/xcuserdata/patrickjmcd.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/src/AnalogIn.cpp b/src/AnalogIn.cpp
index 116642a..584de3d 100644
--- a/src/AnalogIn.cpp
+++ b/src/AnalogIn.cpp
@@ -28,7 +28,7 @@ AnalogIn::AnalogIn(int channel, double rawMin, double rawMax, double euMin, doub
 	m = (euMax - euMin) / (rawMax - rawMin);
 	b = euMax - m * (rawMax);
 }
-void shiftright (double myarray[], int size)
+void ainShiftRight (double myarray[], int size)
 {
 	double temp;
 
@@ -61,7 +61,7 @@ double AnalogIn::setValue(int value){
 	double pv  = m * rawValue + b;
 	lastValue = pv;
 	//TODO: lastStored = Instant.now();
-	shiftright(history, 100);
+	ainShiftRight(history, 100);
 	history[0] = lastValue;
 	return pv;
 }
diff --git a/src/Measurement.cpp b/src/Measurement.cpp
index 615e759..1ca5dcc 100644
--- a/src/Measurement.cpp
+++ b/src/Measurement.cpp
@@ -22,7 +22,7 @@ Measurement::Measurement(std::string tagName){
     
 }
 
-void shiftright (double myarray[], int size)
+void measShiftRight (double myarray[], int size)
 {
     double temp;
     
@@ -144,8 +144,8 @@ int Measurement::update(double value){
     return reportValue;
 }
 void Measurement::endOfDay(){
-    shiftright(totalHistory, 100);
-    shiftright(averageHistory, 100);
+    measShiftRight(totalHistory, 100);
+    measShiftRight(averageHistory, 100);
     
     totalHistory[0] = total;
     averageHistory[0] = average;