diff --git a/src/pathfinder/yapf/nodelist.hpp b/src/pathfinder/yapf/nodelist.hpp
index bedc57294e..cf5a476e4d 100644
--- a/src/pathfinder/yapf/nodelist.hpp
+++ b/src/pathfinder/yapf/nodelist.hpp
@@ -65,14 +65,14 @@ public:
 	/** Notify the nodelist that we don't want to discard the given node. */
 	inline void FoundBestNode(Titem &item)
 	{
-		/* for now it is enough to invalidate m_new_node if it is our given node */
+		/* for now it is enough to invalidate new_node if it is our given node */
 		if (&item == this->new_node) {
 			this->new_node = nullptr;
 		}
 		/* TODO: do we need to store best nodes found in some extra list/array? Probably not now. */
 	}
 
-	/** insert given item as open node (into m_open and m_open_queue) */
+	/** insert given item as open node (into open_nodes and open_queue) */
 	inline void InsertOpenNode(Titem &item)
 	{
 		assert(this->closed_nodes.Find(item.GetKey()) == nullptr);
diff --git a/src/pathfinder/yapf/yapf_costrail.hpp b/src/pathfinder/yapf/yapf_costrail.hpp
index 94ce07106d..712dc9266a 100644
--- a/src/pathfinder/yapf/yapf_costrail.hpp
+++ b/src/pathfinder/yapf/yapf_costrail.hpp
@@ -269,7 +269,7 @@ public:
 	/**
 	 * Called by YAPF to calculate the cost from the origin to the given node.
 	 *  Calculates only the cost of given node, adds it to the parent node cost
-	 *  and stores the result into Node::m_cost member
+	 *  and stores the result into Node::cost member
 	 */
 	inline bool PfCalcCost(Node &n, const TrackFollower *tf)
 	{
diff --git a/src/pathfinder/yapf/yapf_road.cpp b/src/pathfinder/yapf/yapf_road.cpp
index 94db5b00c9..7646b085bc 100644
--- a/src/pathfinder/yapf/yapf_road.cpp
+++ b/src/pathfinder/yapf/yapf_road.cpp
@@ -109,7 +109,7 @@ public:
 	/**
 	 * Called by YAPF to calculate the cost from the origin to the given node.
 	 *  Calculates only the cost of given node, adds it to the parent node cost
-	 *  and stores the result into Node::m_cost member
+	 *  and stores the result into Node::cost member
 	 */
 	inline bool PfCalcCost(Node &n, const TrackFollower *)
 	{
@@ -211,7 +211,7 @@ public:
 
 	/**
 	 * Called by YAPF to calculate cost estimate. Calculates distance to the destination
-	 *  adds it to the actual cost from origin and stores the sum to the Node::m_estimate
+	 *  adds it to the actual cost from origin and stores the sum to the Node::estimate
 	 */
 	inline bool PfCalcEstimate(Node &n)
 	{
@@ -292,7 +292,7 @@ public:
 
 	/**
 	 * Called by YAPF to calculate cost estimate. Calculates distance to the destination
-	 *  adds it to the actual cost from origin and stores the sum to the Node::m_estimate
+	 *  adds it to the actual cost from origin and stores the sum to the Node::estimate
 	 */
 	inline bool PfCalcEstimate(Node &n)
 	{
diff --git a/src/pathfinder/yapf/yapf_ship.cpp b/src/pathfinder/yapf/yapf_ship.cpp
index 8b0c04bffb..f149a63220 100644
--- a/src/pathfinder/yapf/yapf_ship.cpp
+++ b/src/pathfinder/yapf/yapf_ship.cpp
@@ -91,7 +91,7 @@ public:
 
 	/**
 	 * Called by YAPF to calculate cost estimate. Calculates distance to the destination
-	 * adds it to the actual cost from origin and stores the sum to the Node::m_estimate.
+	 * adds it to the actual cost from origin and stores the sum to the Node::estimate.
 	 */
 	inline bool PfCalcEstimate(Node &n)
 	{
@@ -367,7 +367,7 @@ public:
 	/**
 	 * Called by YAPF to calculate the cost from the origin to the given node.
 	 * Calculates only the cost of given node, adds it to the parent node cost
-	 * and stores the result into Node::m_cost member.
+	 * and stores the result into Node::cost member.
 	 */
 	inline bool PfCalcCost(Node &n, const TrackFollower *tf)
 	{
diff --git a/src/pathfinder/yapf/yapf_ship_regions.cpp b/src/pathfinder/yapf/yapf_ship_regions.cpp
index fa96143585..d6716980d4 100644
--- a/src/pathfinder/yapf/yapf_ship_regions.cpp
+++ b/src/pathfinder/yapf/yapf_ship_regions.cpp
@@ -238,7 +238,7 @@ public:
 	/**
 	 * Called by YAPF to calculate the cost from the origin to the given node.
 	 * Calculates only the cost of given node, adds it to the parent node cost
-	 * and stores the result into Node::m_cost member.
+	 * and stores the result into Node::cost member.
 	 */
 	inline bool PfCalcCost(Node &n, const TrackFollower *)
 	{