diff --git a/src/datamodel.c b/src/datamodel.c
index ad75e67c432162476ea96630dccdfa725c8edceb..f1e0c5c7c5838987915dcdefe7310de290b8613d 100644
--- a/src/datamodel.c
+++ b/src/datamodel.c
@@ -170,7 +170,7 @@ static int set_SoftwareModulesExecEnv_Enable(char *refparam, struct dmctx *ctx,
 
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_boolean(value))
+			if (bbfdm_validate_boolean(ctx, value))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -222,7 +222,7 @@ static int set_SoftwareModulesExecEnv_Alias(char *refparam, struct dmctx *ctx, v
 
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (bbfdm_validate_string(ctx, value, -1, 64, NULL, NULL))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -403,7 +403,7 @@ static int set_SoftwareModulesDeploymentUnit_Alias(char *refparam, struct dmctx
 
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (bbfdm_validate_string(ctx, value, -1, 64, NULL, NULL))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -590,7 +590,7 @@ static int set_SoftwareModulesExecutionUnit_Alias(char *refparam, struct dmctx *
 
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (bbfdm_validate_string(ctx, value, -1, 64, NULL, NULL))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -623,7 +623,7 @@ static int set_SoftwareModulesExecutionUnit_AutoStart(char *refparam, struct dmc
 
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_boolean(value))
+			if (bbfdm_validate_boolean(ctx, value))
 				return FAULT_9007;
 			break;
 		case VALUESET: