diff --git a/inc/Services/FunctionManagementService.hpp b/inc/Services/FunctionManagementService.hpp
index 4ab4bb2700fcbb8c2bd4a43178cf8a2fcf482809..54640fbd0ef3e238b62cb1cf26c9cdf5f6ebce1a 100644
--- a/inc/Services/FunctionManagementService.hpp
+++ b/inc/Services/FunctionManagementService.hpp
@@ -12,7 +12,7 @@
 #include "Service.hpp"
 
 #define FUNCMAPSIZE        128     // size of the function map in bytes (temporary, arbitrary)
-#define MAXFUNCNAMELENGTH  32      // max length of the function name (temporary, arbitrary)
+#define FUNCNAMELENGTH     32      // max length of the function name (temporary, arbitrary)
 #define MAXARGLENGTH       32      // maximum argument byte string length (temporary, arbitrary)
 
 /**
@@ -37,7 +37,7 @@
  * @author Grigoris Pavlakis <grigpavl@ece.auth.gr>
  */
 
-typedef String<MAXFUNCNAMELENGTH> functionName;
+typedef String<FUNCNAMELENGTH> functionName;
 typedef etl::map<functionName, void(*)(String<MAXARGLENGTH>), FUNCMAPSIZE>
 FunctionMap;
 
@@ -77,7 +77,7 @@ public:
 	 * @param ptr pointer to a function of void return type and a MAXARGLENGTH-lengthed byte
 	 * string as argument (which contains the actual arguments of the function)
 	 */
-	int include(String<MAXFUNCNAMELENGTH> funcName, void(*ptr)(String<MAXARGLENGTH>));
+	int include(String<FUNCNAMELENGTH> funcName, void(*ptr)(String<MAXARGLENGTH>));
 };
 
 #endif //ECSS_SERVICES_FUNCTIONMANAGEMENTSERVICE_HPP
diff --git a/src/Services/FunctionManagementService.cpp b/src/Services/FunctionManagementService.cpp
index d4d51d8d37e0c437cec54a6e26b754d87b9c2271..24c45150d679145bd3679d04bdf53b6af7796531 100644
--- a/src/Services/FunctionManagementService.cpp
+++ b/src/Services/FunctionManagementService.cpp
@@ -19,10 +19,10 @@
 //
 //FunctionManagementService::FunctionManagementService() {
 //	// Sample inclusion of functions in the pointer map.
-//	include(String<MAXFUNCNAMELENGTH>("dummy1"), &dummy1);
-//	include(String<MAXFUNCNAMELENGTH>("foo"), &foo);
-//	include(String<MAXFUNCNAMELENGTH>("bar"), &bar);
-//	include(String<MAXFUNCNAMELENGTH>("baz"), &baz);
+//	include(String<FUNCNAMELENGTH>("dummy1"), &dummy1);
+//	include(String<FUNCNAMELENGTH>("foo"), &foo);
+//	include(String<FUNCNAMELENGTH>("bar"), &bar);
+//	include(String<FUNCNAMELENGTH>("baz"), &baz);
 //	// All the functions that should be included in the pointer map at initialization shall be here.
 //}
 #else
@@ -35,13 +35,13 @@ int FunctionManagementService::call(Message msg){
 	assert(msg.messageType == 1);
 	assert(msg.serviceType == 8);
 
-	uint8_t funcName[MAXFUNCNAMELENGTH];  // the function's name
+	uint8_t funcName[FUNCNAMELENGTH];  // the function's name
 	uint8_t funcArgs[MAXARGLENGTH];    // arguments for the function
 
-	msg.readString(funcName, MAXFUNCNAMELENGTH);
+	msg.readString(funcName, FUNCNAMELENGTH);
 	msg.readString(funcArgs, MAXARGLENGTH);
 
-	if (msg.dataSize > MAXFUNCNAMELENGTH + MAXARGLENGTH) {
+	if (msg.dataSize > FUNCNAMELENGTH + MAXARGLENGTH) {
 		/**
 		 * @todo Send failed start of execution (too long message)
 		 */
@@ -49,7 +49,7 @@ int FunctionManagementService::call(Message msg){
 	}
 
 	// locate the appropriate function pointer
-	String<MAXFUNCNAMELENGTH> name(funcName);
+	String<FUNCNAMELENGTH> name(funcName);
 	FunctionMap::iterator iter = funcPtrIndex.find(name);
 	void(*selected)(String<MAXARGLENGTH>);
 
@@ -68,7 +68,7 @@ int FunctionManagementService::call(Message msg){
 	return 0;
 }
 
-int FunctionManagementService::include(String<MAXFUNCNAMELENGTH> funcName, void(*ptr)
+int FunctionManagementService::include(String<FUNCNAMELENGTH> funcName, void(*ptr)
 	(String<MAXARGLENGTH>)) {
 
 	if (funcPtrIndex.full()) {
@@ -78,7 +78,7 @@ int FunctionManagementService::include(String<MAXFUNCNAMELENGTH> funcName, void(
 		return 2;  // arbitrary, for testing purposes
 	}
 
-	funcName.append(MAXFUNCNAMELENGTH - funcName.length(), '\0');
+	funcName.append(FUNCNAMELENGTH - funcName.length(), '\0');
 	funcPtrIndex.insert(std::make_pair(funcName, ptr));
 
 	return 0;
diff --git a/test/Services/FunctionManagementService.cpp b/test/Services/FunctionManagementService.cpp
index 79d4b958d3323ebc4f6ec4f198e9100005b9864e..365952e5f65b9f443e7721b169df4f86715f3115 100644
--- a/test/Services/FunctionManagementService.cpp
+++ b/test/Services/FunctionManagementService.cpp
@@ -11,16 +11,16 @@ TEST_CASE("FMS - Call Tests") {
 	FunctionManagementService fms;
 
 	SECTION("Malformed name") {
-		fms.include(String<MAXFUNCNAMELENGTH>("test"), &test);
+		fms.include(String<FUNCNAMELENGTH>("test"), &test);
 		Message msg(8, 1, Message::TC, 1);
-		msg.appendString(String<MAXFUNCNAMELENGTH>("t3st"));
+		msg.appendString(String<FUNCNAMELENGTH>("t3st"));
 		CHECK(fms.call(msg) == 1);
 	}
 
 	SECTION("Too long message") {
-		fms.include(String<MAXFUNCNAMELENGTH>("test"), &test);
+		fms.include(String<FUNCNAMELENGTH>("test"), &test);
 		Message msg(8, 1, Message::TC, 1);
-		msg.appendString(String<MAXFUNCNAMELENGTH>("test"));
+		msg.appendString(String<FUNCNAMELENGTH>("test"));
 		msg.appendString(String<65>
 		    ("eqrhjweghjhwqgthjkrghthjkdsfhgsdfhjsdjsfdhgkjdfsghfjdgkdfsgdfgsgd"));
 		CHECK(fms.call(msg) == 4);
@@ -36,7 +36,7 @@ TEST_CASE("FMS - Insert Tests") {
 		// make sure the pointer map is full to the brim
 		for (int i = 0; i < 15000; i++) {
 			name = "test" + i;
-			String<MAXFUNCNAMELENGTH> funcName(name.c_str());
+			String<FUNCNAMELENGTH> funcName(name.c_str());
 
 			if (~fms.funcPtrIndex.full()) {  // not ! because vera whines about "using negation
 				// in its short form"
@@ -47,7 +47,7 @@ TEST_CASE("FMS - Insert Tests") {
 			}
 		}
 
-		CHECK(fms.include(String<MAXFUNCNAMELENGTH>("testall"), &test) == 2);
+		CHECK(fms.include(String<FUNCNAMELENGTH>("testall"), &test) == 2);
 	}
 }