diff --git a/OpenRA.Mods.Common/Scripting/Properties/AirstrikeProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/AirstrikeProperties.cs
index 7ab314dfe5..2c745413ca 100644
--- a/OpenRA.Mods.Common/Scripting/Properties/AirstrikeProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/AirstrikeProperties.cs
@@ -16,7 +16,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Scripting
 {
-	[ScriptGlobal("Air Support Powers")]
+	[ScriptPropertyGroup("Support Powers")]
 	public class AirstrikeProperties : ScriptActorProperties, Requires<AirstrikePowerInfo>
 	{
 		readonly AirstrikePower ap;
diff --git a/OpenRA.Mods.Common/Scripting/Properties/GuardProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/GuardProperties.cs
index bf947cae36..ecadcc632b 100644
--- a/OpenRA.Mods.Common/Scripting/Properties/GuardProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/GuardProperties.cs
@@ -14,7 +14,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Scripting
 {
-	[ScriptPropertyGroup("Guard")]
+	[ScriptPropertyGroup("Combat")]
 	public class GuardProperties : ScriptActorProperties, Requires<GuardInfo>, Requires<IMoveInfo>
 	{
 		Guard guard;
diff --git a/OpenRA.Mods.Common/Scripting/Properties/HarvesterProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/HarvesterProperties.cs
index ebc6a48084..736d011c31 100644
--- a/OpenRA.Mods.Common/Scripting/Properties/HarvesterProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/HarvesterProperties.cs
@@ -14,7 +14,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Scripting
 {
-	[ScriptPropertyGroup("Harvester")]
+	[ScriptPropertyGroup("Movement")]
 	public class HarvesterProperties : ScriptActorProperties, Requires<HarvesterInfo>
 	{
 		readonly Harvester harvester;
diff --git a/OpenRA.Mods.Common/Scripting/Properties/TransformProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/TransformProperties.cs
index 7fec27e43a..6d93afd751 100644
--- a/OpenRA.Mods.Common/Scripting/Properties/TransformProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/TransformProperties.cs
@@ -14,7 +14,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Scripting
 {
-	[ScriptPropertyGroup("Transform")]
+	[ScriptPropertyGroup("General")]
 	public class TransformProperties : ScriptActorProperties, Requires<TransformsInfo>
 	{
 		readonly Transforms transforms;
diff --git a/OpenRA.Mods.RA/Scripting/Properties/ParadropProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/ParadropProperties.cs
index 4f0b488e3b..f864a1868b 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/ParadropProperties.cs
+++ b/OpenRA.Mods.RA/Scripting/Properties/ParadropProperties.cs
@@ -15,7 +15,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Scripting
 {
-	[ScriptPropertyGroup("Paradrop")]
+	[ScriptPropertyGroup("Transports")]
 	public class ParadropProperties : ScriptActorProperties, Requires<CargoInfo>, Requires<ParaDropInfo>
 	{
 		readonly ParaDrop paradrop;
diff --git a/OpenRA.Mods.RA/Scripting/Properties/ParatroopersProperties.cs b/OpenRA.Mods.RA/Scripting/Properties/ParatroopersProperties.cs
index 28eac52732..8ac3cec495 100644
--- a/OpenRA.Mods.RA/Scripting/Properties/ParatroopersProperties.cs
+++ b/OpenRA.Mods.RA/Scripting/Properties/ParatroopersProperties.cs
@@ -15,7 +15,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Scripting
 {
-	[ScriptPropertyGroup("Paratroopers")]
+	[ScriptPropertyGroup("Support Powers")]
 	public class ParatroopersProperties : ScriptActorProperties, Requires<ParatroopersPowerInfo>
 	{
 		readonly ParatroopersPower pp;