diff --git a/python-api-src/lib_unit.cpp b/python-api-src/lib_unit.cpp
index 7a7ee508b3f9d780d79a668c1be79af4d7c5ae59..9ba780fdb01304dc0d07b13003e0f6631c8422ac 100644
--- a/python-api-src/lib_unit.cpp
+++ b/python-api-src/lib_unit.cpp
@@ -30,7 +30,7 @@ void define_unit(py::module & m)
         .def_property_readonly("has_target", &Unit::hasTarget)
         .def_property_readonly("max_hit_points", &Unit::getMaxHitPoints)
         .def_property_readonly("progress", &Unit::getProgress)
-        .def_property_readonly("ability_id", &Unit::getAbilityID, "The AbilityID of currently used ability")
+        .def_property_readonly("current_ability_id", &Unit::getCurrentAbilityID, "The AbilityID of currently used ability")
         .def_property_readonly("facing", &Unit::getFacing)
         .def_property_readonly("radius", &Unit::getRadius)
         .def("hold_position", &Unit::holdPosition)
diff --git a/python-api-src/lib_unittype.cpp b/python-api-src/lib_unittype.cpp
index edeebeaed017006a1aece81ee723b3cb507749cf..1b0da0709cb98494be97d6afef22f69aa15de820 100644
--- a/python-api-src/lib_unittype.cpp
+++ b/python-api-src/lib_unittype.cpp
@@ -12,7 +12,7 @@ void define_unittype(py::module & m)
         .def_property_readonly("race", &UnitType::getRace)
         .def_property_readonly("movement_speed", &UnitType::getMovementSpeed)
         .def_property_readonly("sight_range", &UnitType::getSightRange)
-        .def_property_readonly("tech_requirement", &UnitType::getTechRequirement)
+        .def_property_readonly("required_structure", &UnitType::getRequiredStructure)
         .def_property_readonly("is_valid", &UnitType::isValid)
         .def_property_readonly("is_building", &UnitType::isBuilding)
         .def_property_readonly("is_combat_unit", &UnitType::isCombatUnit, "The unit is not any of the following: worker, supply provider, building, larva, egg")
diff --git a/src/Unit.cpp b/src/Unit.cpp
index b47005e09993e327f518cc1cc0132d80b2d9ee88..24236d48c6cfdd520df0dc42cd9d3d84302c0fe6 100644
--- a/src/Unit.cpp
+++ b/src/Unit.cpp
@@ -370,7 +370,7 @@ float Unit::getProgress() const
 	return -1;
 }
 
-sc2::AbilityID Unit::getAbilityID() const
+sc2::AbilityID Unit::getCurrentAbilityID() const
 {
 	BOT_ASSERT(isValid(), "Unit is not valid");
 
diff --git a/src/Unit.h b/src/Unit.h
index 2a645b5e63cbe4e7a6d3677a441b99dea7f79bc6..773962ffb3e5e1550762c756be8190f3992a20f4 100644
--- a/src/Unit.h
+++ b/src/Unit.h
@@ -52,7 +52,7 @@ public:
     Unit getTarget() const;
     CCHealth getMaxHitPoints() const;
     float getProgress() const;
-    sc2::AbilityID getAbilityID() const;
+    sc2::AbilityID getCurrentAbilityID() const;
     void holdPosition() const;
     void patrol(const CCPosition & targetPosition) const;
     void stopDance() const;
diff --git a/src/UnitType.cpp b/src/UnitType.cpp
index 44225edccfbc2f5332a6b9e8f9938f3889cf9078..b1124c174f33816c16c86a001240d558f313dd79 100644
--- a/src/UnitType.cpp
+++ b/src/UnitType.cpp
@@ -383,7 +383,7 @@ int UnitType::getSightRange() const
 	return m_bot->Observation()->GetUnitTypeData()[m_type].sight_range;
 }
 
-sc2::UnitTypeID UnitType::getTechRequirement() const
+sc2::UnitTypeID UnitType::getRequiredStructure() const
 {
 	return m_bot->Observation()->GetUnitTypeData()[m_type].tech_requirement;
 }
diff --git a/src/UnitType.h b/src/UnitType.h
index ceaaef3f69bfe5d684ebf7c9efe2a0457e1b9113..72ea02820e92dca208e52e3b72cb0dd087962474 100644
--- a/src/UnitType.h
+++ b/src/UnitType.h
@@ -25,7 +25,7 @@ public:
 	
     int getMovementSpeed() const;
     int getSightRange() const;
-    sc2::UnitTypeID getTechRequirement() const;
+    sc2::UnitTypeID getRequiredStructure() const;
     
     bool isValid() const;
     bool isBuilding() const;