diff --git a/core/src/net/sf/openrocket/rocketcomponent/ComponentAssembly.java b/core/src/net/sf/openrocket/rocketcomponent/ComponentAssembly.java
index cee911aef..55db91984 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/ComponentAssembly.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/ComponentAssembly.java
@@ -158,7 +158,7 @@ public abstract class ComponentAssembly extends RocketComponent implements Axial
 		}else{
 			throw new BugException("Unrecognized subclass of Component Assembly.  Please update this method.");
 		}
-		fireComponentChangeEvent(ComponentChangeEvent.AERODYNAMIC_CHANGE);
+		fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
 	}
 	
 	@Override
diff --git a/core/src/net/sf/openrocket/rocketcomponent/InternalComponent.java b/core/src/net/sf/openrocket/rocketcomponent/InternalComponent.java
index f108eddf2..7ec178245 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/InternalComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/InternalComponent.java
@@ -22,7 +22,7 @@ public abstract class InternalComponent extends RocketComponent implements Axial
 	@Override
 	public void setAxialMethod(final AxialMethod newAxialMethod) {
 		super.setAxialMethod(newAxialMethod);
-		fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
+		fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
 	}
 	
 
diff --git a/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java b/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java
index 23f2f0474..7a1fabe7b 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java
@@ -181,7 +181,7 @@ public class ParallelStage extends AxialStage implements FlightConfigurableCompo
 		
 		super.setAxialMethod(_newPosition);
 		
-		fireComponentChangeEvent(ComponentChangeEvent.AERODYNAMIC_CHANGE);
+		fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
 	}
 	
 	@Override
diff --git a/core/src/net/sf/openrocket/rocketcomponent/PodSet.java b/core/src/net/sf/openrocket/rocketcomponent/PodSet.java
index 3e40d899d..f0cdaaa76 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/PodSet.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/PodSet.java
@@ -119,7 +119,7 @@ public class PodSet extends ComponentAssembly implements RingInstanceable {
 	@Override
 	public void setAxialMethod( final AxialMethod newMethod ) {
 		super.setAxialMethod( newMethod );
-		fireComponentChangeEvent( ComponentChangeEvent.BOTH_CHANGE );
+		fireComponentChangeEvent( ComponentChangeEvent.NONFUNCTIONAL_CHANGE );
 	}
 	
 	@Override
diff --git a/core/src/net/sf/openrocket/rocketcomponent/RailButton.java b/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
index 88cc83198..10241780f 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
@@ -208,7 +208,7 @@ public class RailButton extends ExternalComponent implements AnglePositionable,
 	@Override
 	public void setAxialMethod( AxialMethod position) {
 		super.setAxialMethod(position);
-		fireComponentChangeEvent(ComponentChangeEvent.AERODYNAMIC_CHANGE);
+		fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
 	}
 	
 	public BoundingBox getInstanceBoundingBox(){
diff --git a/core/src/net/sf/openrocket/rocketcomponent/TubeFinSet.java b/core/src/net/sf/openrocket/rocketcomponent/TubeFinSet.java
index 0ebcb803d..820e6896d 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/TubeFinSet.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/TubeFinSet.java
@@ -225,7 +225,7 @@ public class TubeFinSet extends ExternalComponent implements AxialPositionable,
 	@Override
 	public void setAxialMethod(AxialMethod position) {
 		super.setAxialMethod(position);
-		fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
+		fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
 	}
 	
 	@Override