diff --git a/inc/Services/FunctionManagementService.hpp b/inc/Services/FunctionManagementService.hpp
index 54640fbd0ef3e238b62cb1cf26c9cdf5f6ebce1a..b324f0e6e7d3e120b44dc7622231454e7f9b2b80 100644
--- a/inc/Services/FunctionManagementService.hpp
+++ b/inc/Services/FunctionManagementService.hpp
@@ -11,9 +11,9 @@
 #include "Message.hpp"
 #include "Service.hpp"
 
-#define FUNCMAPSIZE        128     // size of the function map in bytes (temporary, arbitrary)
-#define FUNCNAMELENGTH     32      // max length of the function name (temporary, arbitrary)
-#define MAXARGLENGTH       32      // maximum argument byte string length (temporary, arbitrary)
+#define FUNCMAPSIZE     128     // size of the function map (number of elements)
+#define FUNCNAMELENGTH  32      // max length of the function name
+#define MAXARGLENGTH    32      // maximum argument byte string length
 
 /**
  * @todo: Undef TESTMODE before flight!!!!