diff --git a/Packages-react/ohif-viewer/src/measurementTools/arrowAnnotate.js b/Packages-react/ohif-viewer/src/measurementTools/ArrowAnnotate.js
similarity index 76%
rename from Packages-react/ohif-viewer/src/measurementTools/arrowAnnotate.js
rename to Packages-react/ohif-viewer/src/measurementTools/ArrowAnnotate.js
index e5568fe1a..9446bd780 100644
--- a/Packages-react/ohif-viewer/src/measurementTools/arrowAnnotate.js
+++ b/Packages-react/ohif-viewer/src/measurementTools/ArrowAnnotate.js
@@ -3,10 +3,10 @@ const displayFunction = data => {
 };
 
 export default {
-  id: 'arrowAnnotate',
+  id: 'ArrowAnnotate',
   name: 'ArrowAnnotate',
   toolGroup: 'allTools',
-  cornerstoneToolType: 'arrowAnnotate',
+  cornerstoneToolType: 'ArrowAnnotate',
   options: {
     measurementTable: {
       displayFunction
diff --git a/Packages-react/ohif-viewer/src/measurementTools/ellipticalRoi.js b/Packages-react/ohif-viewer/src/measurementTools/EllipticalRoi.js
similarity index 88%
rename from Packages-react/ohif-viewer/src/measurementTools/ellipticalRoi.js
rename to Packages-react/ohif-viewer/src/measurementTools/EllipticalRoi.js
index 93096f43b..2747a0a81 100644
--- a/Packages-react/ohif-viewer/src/measurementTools/ellipticalRoi.js
+++ b/Packages-react/ohif-viewer/src/measurementTools/EllipticalRoi.js
@@ -10,10 +10,10 @@ const displayFunction = data => {
 };
 
 export default {
-  id: 'ellipticalRoi',
+  id: 'EllipticalRoi',
   name: 'Ellipse',
   toolGroup: 'allTools',
-  cornerstoneToolType: 'ellipticalRoi',
+  cornerstoneToolType: 'EllipticalRoi',
   options: {
     measurementTable: {
       displayFunction
diff --git a/Packages-react/ohif-viewer/src/measurementTools/length.js b/Packages-react/ohif-viewer/src/measurementTools/Length.js
similarity index 85%
rename from Packages-react/ohif-viewer/src/measurementTools/length.js
rename to Packages-react/ohif-viewer/src/measurementTools/Length.js
index 5348dd859..d02687881 100644
--- a/Packages-react/ohif-viewer/src/measurementTools/length.js
+++ b/Packages-react/ohif-viewer/src/measurementTools/Length.js
@@ -7,10 +7,10 @@ const displayFunction = data => {
 };
 
 export default {
-  id: 'length',
+  id: 'Length',
   name: 'Length',
   toolGroup: 'allTools',
-  cornerstoneToolType: 'length',
+  cornerstoneToolType: 'Length',
   options: {
     measurementTable: {
       displayFunction
diff --git a/Packages-react/ohif-viewer/src/measurementTools/simpleAngle.js b/Packages-react/ohif-viewer/src/measurementTools/SimpleAngle.js
similarity index 84%
rename from Packages-react/ohif-viewer/src/measurementTools/simpleAngle.js
rename to Packages-react/ohif-viewer/src/measurementTools/SimpleAngle.js
index 3197c4043..0792325fd 100644
--- a/Packages-react/ohif-viewer/src/measurementTools/simpleAngle.js
+++ b/Packages-react/ohif-viewer/src/measurementTools/SimpleAngle.js
@@ -7,10 +7,10 @@ const displayFunction = data => {
 };
 
 export default {
-  id: 'simpleAngle',
+  id: 'SimpleAngle',
   name: 'SimpleAngle',
   toolGroup: 'allTools',
-  cornerstoneToolType: 'simpleAngle',
+  cornerstoneToolType: 'SimpleAngle',
   options: {
     measurementTable: {
       displayFunction
diff --git a/Packages-react/ohif-viewer/src/measurementTools/index.js b/Packages-react/ohif-viewer/src/measurementTools/index.js
index 803422ca4..e6e1ec548 100644
--- a/Packages-react/ohif-viewer/src/measurementTools/index.js
+++ b/Packages-react/ohif-viewer/src/measurementTools/index.js
@@ -1,15 +1,15 @@
-import length from './length';
-import ellipticalRoi from './ellipticalRoi';
-import rectangleRoi from './rectangleRoi';
-import simpleAngle from './simpleAngle';
-import arrowAnnotate from './arrowAnnotate';
+import Length from './Length';
+import EllipticalRoi from './EllipticalRoi';
+import RectangleRoi from './rectangleRoi';
+import SimpleAngle from './SimpleAngle';
+import ArrowAnnotate from './ArrowAnnotate';
 
 const trackedTools = [
-  length,
-  ellipticalRoi,
-  rectangleRoi,
-  simpleAngle,
-  arrowAnnotate
+  Length,
+  EllipticalRoi,
+  RectangleRoi,
+  SimpleAngle,
+  ArrowAnnotate
 ];
 
 export default [
diff --git a/Packages-react/ohif-viewer/src/measurementTools/rectangleRoi.js b/Packages-react/ohif-viewer/src/measurementTools/rectangleRoi.js
index 1248bdc2c..893e0c4a9 100644
--- a/Packages-react/ohif-viewer/src/measurementTools/rectangleRoi.js
+++ b/Packages-react/ohif-viewer/src/measurementTools/rectangleRoi.js
@@ -7,10 +7,10 @@ const displayFunction = data => {
 };
 
 export default {
-  id: 'rectangleRoi',
+  id: 'RectangleRoi',
   name: 'Rectangle',
   toolGroup: 'allTools',
-  cornerstoneToolType: 'rectangleRoi',
+  cornerstoneToolType: 'RectangleRoi',
   options: {
     measurementTable: {
       displayFunction