diff --git a/megamek/src/megamek/common/WeaponType.java b/megamek/src/megamek/common/WeaponType.java
index b8585228f0a..ea8ad386cce 100644
--- a/megamek/src/megamek/common/WeaponType.java
+++ b/megamek/src/megamek/common/WeaponType.java
@@ -230,6 +230,7 @@ public class WeaponType extends EquipmentType {
     public static final int CLASS_TELE_MISSILE = 25;
     public static final int CLASS_GAUSS = 26;
     public static final int CLASS_THUNDERBOLT = 27;
+    public static final int CLASS_MORTAR = 28;
 
     public static final int WEAPON_DIRECT_FIRE = 0;
     public static final int WEAPON_CLUSTER_BALLISTIC = 1;
@@ -249,7 +250,7 @@ public class WeaponType extends EquipmentType {
     // Used for BA vs BA damage for BA Plasma Rifle
     public static final int WEAPON_PLASMA = 15;
 
-    public static String[] classNames = { "Unknown", "Laser", "Point Defense", "PPC", "Pulse Laser", "Artilery", "AMS",
+    public static String[] classNames = { "Unknown", "Laser", "Point Defense", "PPC", "Pulse Laser", "Artillery", "Plasma",
             "AC", "LBX", "LRM", "SRM", "MRM", "ATM", "Rocket Launcher", "Capital Laser", "Capital PPC", "Capital AC",
             "Capital Gauss", "Capital Missile", "AR10", "Screen", "Sub Capital Cannon", "Capital Mass Driver", "AMS" };
 
diff --git a/megamek/src/megamek/common/weapons/battlearmor/ISBATubeArtillery.java b/megamek/src/megamek/common/weapons/battlearmor/ISBATubeArtillery.java
index f675a484e53..1c468b044fd 100644
--- a/megamek/src/megamek/common/weapons/battlearmor/ISBATubeArtillery.java
+++ b/megamek/src/megamek/common/weapons/battlearmor/ISBATubeArtillery.java
@@ -43,7 +43,7 @@ public ISBATubeArtillery() {
         rulesRefs = "284, TO";
         flags = flags.or(F_BA_WEAPON).andNot(F_MECH_WEAPON).andNot(F_TANK_WEAPON).or(F_MEK_MORTAR).or(F_MISSILE);
         damage = DAMAGE_BY_CLUSTERTABLE;
-        atClass = CLASS_NONE;
+        atClass = CLASS_ARTILLERY;
         infDamageClass = WEAPON_CLUSTER_MISSILE;
         techAdvancement.setTechBase(TECH_BASE_IS)
                 .setIntroLevel(false)
@@ -55,12 +55,12 @@ public ISBATubeArtillery() {
                 .setPrototypeFactions(F_CS)
                 .setProductionFactions(F_CS);
     }
-    
+
     @Override
     public boolean hasIndirectFire() {
         return true;
     }
-    
+
     @Override
     public void adaptToGameOptions(GameOptions gOp) {
         super.adaptToGameOptions(gOp);
diff --git a/megamek/src/megamek/common/weapons/mortars/MekMortarWeapon.java b/megamek/src/megamek/common/weapons/mortars/MekMortarWeapon.java
index 902a36a5540..4e1dfce4593 100644
--- a/megamek/src/megamek/common/weapons/mortars/MekMortarWeapon.java
+++ b/megamek/src/megamek/common/weapons/mortars/MekMortarWeapon.java
@@ -47,7 +47,7 @@ public MekMortarWeapon() {
         super();
         ammoType = AmmoType.T_MEK_MORTAR;
         damage = DAMAGE_BY_CLUSTERTABLE;
-        atClass = CLASS_NONE;
+        atClass = CLASS_MORTAR;
         flags = flags.or(F_MEK_MORTAR).or(F_MORTARTYPE_INDIRECT).or(F_MECH_WEAPON).or(F_MISSILE).or(F_TANK_WEAPON);
         infDamageClass = WEAPON_CLUSTER_MISSILE;
     }