diff --git a/watcher/decision_engine/goal/goals.py b/watcher/decision_engine/goal/goals.py
index 55a40e728..4ce9dbda3 100644
--- a/watcher/decision_engine/goal/goals.py
+++ b/watcher/decision_engine/goal/goals.py
@@ -148,7 +148,7 @@ class AirflowOptimization(base.Goal):
 
     @classmethod
     def get_name(cls):
-        return "airflow optimization"
+        return "airflow_optimization"
 
     @classmethod
     def get_display_name(cls):
diff --git a/watcher/decision_engine/strategy/strategies/uniform_airflow.py b/watcher/decision_engine/strategy/strategies/uniform_airflow.py
index c5c5cd61b..95ab9de99 100644
--- a/watcher/decision_engine/strategy/strategies/uniform_airflow.py
+++ b/watcher/decision_engine/strategy/strategies/uniform_airflow.py
@@ -106,7 +106,7 @@ class UniformAirflow(base.BaseStrategy):
 
     @classmethod
     def get_name(cls):
-        return "uniform airflow"
+        return "uniform_airflow"
 
     @classmethod
     def get_display_name(cls):