diff --git a/force_bdss/core/input_slot_map.py b/force_bdss/core/input_slot_info.py
similarity index 100%
rename from force_bdss/core/input_slot_map.py
rename to force_bdss/core/input_slot_info.py
diff --git a/force_bdss/core/tests/test_input_slot_map.py b/force_bdss/core/tests/test_input_slot_map.py
index 68b3b39abdaf38de8b677dbabf7908d9d4c0386b..8dc631c777eb312b277c1e9a7b766052309c44e2 100644
--- a/force_bdss/core/tests/test_input_slot_map.py
+++ b/force_bdss/core/tests/test_input_slot_map.py
@@ -1,7 +1,7 @@
 import unittest
 from traits.api import TraitError
 
-from force_bdss.core.input_slot_map import InputSlotInfo
+from force_bdss.core.input_slot_info import InputSlotInfo
 
 
 class TestDataValue(unittest.TestCase):
diff --git a/force_bdss/data_sources/base_data_source_model.py b/force_bdss/data_sources/base_data_source_model.py
index cae3eed124fb18fb587758165ce566a45afecc29..d210f9492fb32518916802200028e273b286fd72 100644
--- a/force_bdss/data_sources/base_data_source_model.py
+++ b/force_bdss/data_sources/base_data_source_model.py
@@ -1,6 +1,6 @@
 from traits.api import ABCHasStrictTraits, Instance, List, Event
 
-from force_bdss.core.input_slot_map import InputSlotInfo
+from force_bdss.core.input_slot_info import InputSlotInfo
 from force_bdss.core.output_slot_info import OutputSlotInfo
 from force_bdss.data_sources.i_data_source_factory import IDataSourceFactory
 
diff --git a/force_bdss/data_sources/tests/test_base_data_source_model.py b/force_bdss/data_sources/tests/test_base_data_source_model.py
index cf189f978240b85794ad08a50f12ab479a3cfd84..92772237f0ce42a40945a788799a0a6f53966373 100644
--- a/force_bdss/data_sources/tests/test_base_data_source_model.py
+++ b/force_bdss/data_sources/tests/test_base_data_source_model.py
@@ -1,6 +1,6 @@
 import unittest
 
-from force_bdss.core.input_slot_map import InputSlotInfo
+from force_bdss.core.input_slot_info import InputSlotInfo
 from force_bdss.core.output_slot_info import OutputSlotInfo
 
 try:
diff --git a/force_bdss/io/workflow_reader.py b/force_bdss/io/workflow_reader.py
index c2d78ab745deb9309ed1926726d58b87a66644a9..d28c05de645d1138f8effd76f58cd92fe523ff07 100644
--- a/force_bdss/io/workflow_reader.py
+++ b/force_bdss/io/workflow_reader.py
@@ -3,7 +3,7 @@ import logging
 
 from traits.api import HasStrictTraits, Instance
 
-from force_bdss.core.input_slot_map import InputSlotInfo
+from force_bdss.core.input_slot_info import InputSlotInfo
 from force_bdss.core.output_slot_info import OutputSlotInfo
 from force_bdss.core.workflow import Workflow
 from ..factory_registry_plugin import IFactoryRegistryPlugin
diff --git a/force_bdss/kpi/base_kpi_calculator_model.py b/force_bdss/kpi/base_kpi_calculator_model.py
index bdbde3f23d3eb504c25098a84d8098c6db82ec89..425af9e8cbcddaae589a53645e8194f61040ebe6 100644
--- a/force_bdss/kpi/base_kpi_calculator_model.py
+++ b/force_bdss/kpi/base_kpi_calculator_model.py
@@ -1,7 +1,7 @@
 from traits.api import ABCHasStrictTraits, Instance, List, Event
 
 from force_bdss.core.output_slot_info import OutputSlotInfo
-from ..core.input_slot_map import InputSlotInfo
+from ..core.input_slot_info import InputSlotInfo
 from .i_kpi_calculator_factory import IKPICalculatorFactory
 
 
diff --git a/force_bdss/kpi/tests/test_base_kpi_calculator_model.py b/force_bdss/kpi/tests/test_base_kpi_calculator_model.py
index 391b2f13ed9d1efabee364f83734312cab1ad123..d382046c73a4a0f1ed5b4d695da5437ddf4bd906 100644
--- a/force_bdss/kpi/tests/test_base_kpi_calculator_model.py
+++ b/force_bdss/kpi/tests/test_base_kpi_calculator_model.py
@@ -1,6 +1,6 @@
 import unittest
 
-from force_bdss.core.input_slot_map import InputSlotInfo
+from force_bdss.core.input_slot_info import InputSlotInfo
 from force_bdss.core.output_slot_info import OutputSlotInfo
 from force_bdss.kpi.base_kpi_calculator_factory import BaseKPICalculatorFactory
 from force_bdss.kpi.base_kpi_calculator_model import BaseKPICalculatorModel
diff --git a/force_bdss/tests/test_core_evaluation_driver.py b/force_bdss/tests/test_core_evaluation_driver.py
index c0e76a1bfc7128f2c20851fd206b8c3dbfe319cf..c10fed256608334c8502962c3bd3328c3be6ca4c 100644
--- a/force_bdss/tests/test_core_evaluation_driver.py
+++ b/force_bdss/tests/test_core_evaluation_driver.py
@@ -12,7 +12,7 @@ from force_bdss.tests.probe_classes.data_source import ProbeDataSourceFactory
 from force_bdss.tests.probe_classes.kpi_calculator import (
     ProbeKPICalculatorFactory)
 
-from force_bdss.core.input_slot_map import InputSlotInfo
+from force_bdss.core.input_slot_info import InputSlotInfo
 from force_bdss.core.data_value import DataValue
 from force_bdss.core.slot import Slot
 from force_bdss.tests import fixtures