diff --git a/slsDetectorSoftware/commonFiles/error_defs.h b/slsDetectorSoftware/commonFiles/error_defs.h
index da0d2b590..740125b06 100644
--- a/slsDetectorSoftware/commonFiles/error_defs.h
+++ b/slsDetectorSoftware/commonFiles/error_defs.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <cstring>
 #include <iostream>
-// using namespace std;
+// 
 
 /** Error flags */
 /*Assumption: Only upto 63 detectors */
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
index b29837f70..e061328a7 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
@@ -23,7 +23,7 @@ class ZmqSocket;
 
 
 
-//using namespace std;
+
 
 
 
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h
index 45933fe29..57ea92638 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorClient.h
@@ -7,7 +7,7 @@
 
 
 #include <stdlib.h>
-//using namespace std;
+
 
 int dummyCallback(detectorData* d, int p,void*) {
 	cout << "got data "	<< p <<  endl;
diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorCommand.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorCommand.h
index e56c00bad..e3cc7a247 100644
--- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorCommand.h
+++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetectorCommand.h
@@ -6,7 +6,7 @@
 #include "slsDetector.h"
 #include "multiSlsDetector.h"
 #include "slsDetectorCommand.h"
-//using namespace std;
+
 
 
 /** @short This class handles the command line I/Os, help etc. of the text clients  */
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorActions.h b/slsDetectorSoftware/slsDetector/slsDetectorActions.h
index 1c6ce6cca..c2cff331c 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorActions.h
+++ b/slsDetectorSoftware/slsDetector/slsDetectorActions.h
@@ -8,7 +8,7 @@
 #include <fstream>
 
 
-////using namespace std;
+//
 
 /**
 
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorBase.h b/slsDetectorSoftware/slsDetector/slsDetectorBase.h
index 9a4b52f9d..a77649854 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorBase.h
+++ b/slsDetectorSoftware/slsDetector/slsDetectorBase.h
@@ -54,11 +54,6 @@
 
 #include <string>
 
-// using std::string;
-// using std::ofstream;
-// using std::ifstream;
-
-// using namespace std;
 /** 
 
 @libdoc The slsDetectorBase contains also a set of purely virtual functions useful for the implementation of the derived classes
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.h b/slsDetectorSoftware/slsDetector/slsDetectorCommand.h
index 6f533b3e7..38b3637d3 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.h
+++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.h
@@ -5,7 +5,7 @@
 
 #include "sls_detector_defs.h"
 #include "slsDetectorUtils.h"
-//using namespace std;
+
 
 
 /** @short This class handles the command line I/Os, help etc. of the text clients  */
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h
index dad70b386..d49f505ac 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h
@@ -22,7 +22,7 @@ class multiSlsDetectorCommand;
 #include <string>
 
 
-//using namespace std;
+
 
 
 
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h
index 6704d1958..91fbad31e 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h
@@ -31,7 +31,7 @@ extern "C" {
 #include <math.h>
 #include <semaphore.h>
 #include <cstdlib>
-//using namespace std;
+
 
 
 //#include "slsDetectorActions_Standalone.h"
diff --git a/slsDetectorSoftware/threadFiles/CondVar.h b/slsDetectorSoftware/threadFiles/CondVar.h
index b823ef31d..3bf69d146 100644
--- a/slsDetectorSoftware/threadFiles/CondVar.h
+++ b/slsDetectorSoftware/threadFiles/CondVar.h
@@ -8,7 +8,6 @@
 
 #include "Global.h"
 
-using namespace std;
 
 class CondVar {
 public:
diff --git a/slsDetectorSoftware/threadFiles/Multi.h b/slsDetectorSoftware/threadFiles/Multi.h
index b7216c579..cf34396a8 100644
--- a/slsDetectorSoftware/threadFiles/Multi.h
+++ b/slsDetectorSoftware/threadFiles/Multi.h
@@ -4,7 +4,6 @@
 #include "Global.h"
 
 #include <string>
-using namespace std;
 
 class Single;
 class ThreadPool;
@@ -15,10 +14,10 @@ public:
 	Multi();
 	~Multi();
 
-	string executeCommand(int argc,char* argv[]);
+	std::string executeCommand(int argc,char* argv[]);
 
 	int printNumber(int inum);
-	string printString(string s);
+	std::string printString(std::string s);
 	char* printCharArray(char a[]);
 
 	int createThreadPool();
diff --git a/slsDetectorSoftware/threadFiles/Mutex.h b/slsDetectorSoftware/threadFiles/Mutex.h
index a88df0d4e..30ff22208 100644
--- a/slsDetectorSoftware/threadFiles/Mutex.h
+++ b/slsDetectorSoftware/threadFiles/Mutex.h
@@ -10,7 +10,7 @@
 
 #include "Global.h"
 
-using namespace std;
+// using namespace std;
 
 class Mutex
 {
diff --git a/slsDetectorSoftware/threadFiles/Single.h b/slsDetectorSoftware/threadFiles/Single.h
index d8e9e2104..18e355cf0 100644
--- a/slsDetectorSoftware/threadFiles/Single.h
+++ b/slsDetectorSoftware/threadFiles/Single.h
@@ -3,7 +3,7 @@
 #include "Multi.h"
 
 #include <string>
-using namespace std;
+// using namespace std;
 
 class Single {
 public:
diff --git a/slsDetectorSoftware/threadFiles/Task.h b/slsDetectorSoftware/threadFiles/Task.h
index 66b295ba2..a56b72058 100644
--- a/slsDetectorSoftware/threadFiles/Task.h
+++ b/slsDetectorSoftware/threadFiles/Task.h
@@ -14,7 +14,7 @@
 
 #include <iostream>
 #include <stdio.h>
-using namespace std;
+// using namespace std;
 
 class slsDetector;
 
@@ -121,14 +121,14 @@ protected:
 	func0_t <runStatus			>* 								m4;
 	func1_t <int,				int>* 							m5;
 	func1_t <int,				double>*						m6;
-	func1_t <string,			string>* 						m7;
+	func1_t <std::string,		std::string>* 					m7;
 	func1_t <detectorSettings,	int>* 							m8;
 	func2_t <int,				int,int>* 						m9;
-	func2_t <int,				string,int>* 					m10;
+	func2_t <int,				std::string,int>* 				m10;
 	func2_t <dacs_t,			dacIndex,int>* 					m11;
 	func2_t <detectorSettings,	detectorSettings,int>* 			m12;
 	func2_t <int64_t,			timerIndex,int64_t>* 			m13;
-	func2_t <string,			networkParameter,string>* 		m14;
+	func2_t <std::string,		networkParameter,std::string>* 	m14;
 	func3_t <int,				int,int,int>* 					m15;
 	func4_t <int,				trimMode,int,int,int>* 			m16;
 	func4_t <int,				int,int,detectorSettings,int>*	m17;
@@ -146,14 +146,14 @@ public:
 	Task(func0_t <runStatus			>* t):									SuperTask(),fnum(4){m4 = t;};
 	Task(func1_t <int,				int>* t):								SuperTask(),fnum(5){m5 = t;};
 	Task(func1_t <int,				double>* t):							SuperTask(),fnum(6){m6 = t;};
-	Task(func1_t <string,			string>* t):							SuperTask(),fnum(7){m7 = t;};
+	Task(func1_t <std::string,		std::string>* t):						SuperTask(),fnum(7){m7 = t;};
 	Task(func1_t <detectorSettings,	int>* t):								SuperTask(),fnum(8){m8 = t;};
 	Task(func2_t <int,				int,int>* t):	 						SuperTask(),fnum(9){m9 = t;};
-	Task(func2_t <int,				string,int>* t):						SuperTask(),fnum(10){m10 = t;};
+	Task(func2_t <int,				std::string,int>* t):					SuperTask(),fnum(10){m10 = t;};
 	Task(func2_t <dacs_t,			dacIndex,int>* t):                  	SuperTask(),fnum(11){m11 = t;};
 	Task(func2_t <detectorSettings,	detectorSettings,int>* t):				SuperTask(),fnum(12){m12 = t;};
 	Task(func2_t <int64_t,			timerIndex,int64_t>* t):				SuperTask(),fnum(13){m13 = t;};
-	Task(func2_t <string,			networkParameter,string>* t):			SuperTask(),fnum(14){m14 = t;};
+	Task(func2_t <std::string,		networkParameter,std::string>* t):		SuperTask(),fnum(14){m14 = t;};
 	Task(func3_t <int,				int,int,int>* t): 						SuperTask(),fnum(15){m15 = t;};
 	Task(func4_t <int,				trimMode,int,int,int>* t):				SuperTask(),fnum(16){m16 = t;};
 	Task(func4_t <int,				int,int,detectorSettings,int>* t): 		SuperTask(),fnum(17){m17 = t;};
diff --git a/slsDetectorSoftware/threadFiles/ThreadPool.cpp b/slsDetectorSoftware/threadFiles/ThreadPool.cpp
index 63ca4824a..224038f5c 100644
--- a/slsDetectorSoftware/threadFiles/ThreadPool.cpp
+++ b/slsDetectorSoftware/threadFiles/ThreadPool.cpp
@@ -1,6 +1,6 @@
 #include "ThreadPool.h"
 #include <pthread.h>
-
+using namespace std;
 ThreadPool::ThreadPool(int pool_size) : m_pool_size(pool_size){
 #ifdef VERBOSE
 	cout << "Constructed ThreadPool of size " << m_pool_size << endl;
diff --git a/slsDetectorSoftware/threadFiles/ThreadPool.h b/slsDetectorSoftware/threadFiles/ThreadPool.h
index 34a4504cc..2ad172d8c 100644
--- a/slsDetectorSoftware/threadFiles/ThreadPool.h
+++ b/slsDetectorSoftware/threadFiles/ThreadPool.h
@@ -14,7 +14,7 @@
 #include "CondVar.h"
 #include "Global.h"
 #include <semaphore.h>
-using namespace std;
+// using namespace std;
 
 
 class ThreadPool