--- a/src/ai/api/ai_order.hpp	Sat Apr 12 22:28:07 2008 +0000
+++ b/src/ai/api/ai_order.hpp	Sun Apr 13 09:10:59 2008 +0000
@@ -37,9 +37,9 @@
 		AIOF_NONE              = 0,
 
 		/** Do not stop at the stations that are passed when going to the destination. */
-		AIOF_NON_STOP_AT_INTERMEDIATE_STATIONS = 1 << 0,
+		AIOF_NON_STOP_INTERMEDIATE = 1 << 0,
 		/** Do not stop at the destionation station. */
-		AIOF_NON_STOP_AT_DESTINATION_STATION   = 1 << 1,
+		AIOF_NON_STOP_DESTINATION  = 1 << 1,
 
 		/** Always unload the vehicle; only for stations. Cannot be set when AIOF_TRANSFER or AIOF_NO_UNLOAD is set. */
 		AIOF_UNLOAD            = 1 << 2,
@@ -59,7 +59,7 @@
 		AIOF_SERVICE_IF_NEEDED = 1 << 2,
 
 		/** All flags related to non-stop settings. */
-		AIOF_NON_STOP_FLAGS    = AIOF_NON_STOP_AT_INTERMEDIATE_STATIONS | AIOF_NON_STOP_AT_DESTINATION_STATION,
+		AIOF_NON_STOP_FLAGS    = AIOF_NON_STOP_INTERMEDIATE | AIOF_NON_STOP_DESTINATION,
 		/** All flags related to unloading. */
 		AIOF_UNLOAD_FLAGS      = AIOF_TRANSFER | AIOF_UNLOAD | AIOF_NO_UNLOAD,
 		/** All flags related to loading. */

--- a/src/ai/api/ai_order.hpp.sq	Sat Apr 12 22:28:07 2008 +0000
+++ b/src/ai/api/ai_order.hpp.sq	Sun Apr 13 09:10:59 2008 +0000
@@ -24,8 +24,8 @@
 	SQAIOrder.DefSQConst(engine, AIOrder::ERR_ORDER_TOO_MANY,                               "ERR_ORDER_TOO_MANY");
 	SQAIOrder.DefSQConst(engine, AIOrder::ERR_ORDER_TOO_FAR_AWAY_FROM_PREVIOUS_DESTINATION, "ERR_ORDER_TOO_FAR_AWAY_FROM_PREVIOUS_DESTINATION");
 	SQAIOrder.DefSQConst(engine, AIOrder::AIOF_NONE,                                        "AIOF_NONE");
-	SQAIOrder.DefSQConst(engine, AIOrder::AIOF_NON_STOP_AT_INTERMEDIATE_STATIONS,           "AIOF_NON_STOP_AT_INTERMEDIATE_STATIONS");
-	SQAIOrder.DefSQConst(engine, AIOrder::AIOF_NON_STOP_AT_DESTINATION_STATION,             "AIOF_NON_STOP_AT_DESTINATION_STATION");
+	SQAIOrder.DefSQConst(engine, AIOrder::AIOF_NON_STOP_INTERMEDIATE,                       "AIOF_NON_STOP_INTERMEDIATE");
+	SQAIOrder.DefSQConst(engine, AIOrder::AIOF_NON_STOP_DESTINATION,                        "AIOF_NON_STOP_DESTINATION");
 	SQAIOrder.DefSQConst(engine, AIOrder::AIOF_UNLOAD,                                      "AIOF_UNLOAD");
 	SQAIOrder.DefSQConst(engine, AIOrder::AIOF_TRANSFER,                                    "AIOF_TRANSFER");
 	SQAIOrder.DefSQConst(engine, AIOrder::AIOF_NO_UNLOAD,                                   "AIOF_NO_UNLOAD");