diff --git a/TimetableDesigner.Core/BaseGroup.cs b/TimetableDesigner.Core/BaseGroup.cs
index 65afdc4..c60f090 100644
--- a/TimetableDesigner.Core/BaseGroup.cs
+++ b/TimetableDesigner.Core/BaseGroup.cs
@@ -9,32 +9,10 @@ namespace TimetableDesigner.Core
     [Serializable]
     public abstract class BaseGroup : Unit
     {
-        #region FIELDS
-
-        private string _shortName;
-
-        #endregion
-
-
-
-        #region PROPERTIES
-
-        public string ShortName
-        {
-            get => _shortName;
-            set => _shortName = value;
-        }
-
-        #endregion
-
-
-
         #region CONSTRUCTORS
 
         public BaseGroup(ulong id) : base(id)
-        {
-            _shortName = string.Empty;
-        }
+        { }
 
         #endregion
     }
diff --git a/TimetableDesigner.Core/Classroom.cs b/TimetableDesigner.Core/Classroom.cs
index b177872..958e95e 100644
--- a/TimetableDesigner.Core/Classroom.cs
+++ b/TimetableDesigner.Core/Classroom.cs
@@ -12,7 +12,6 @@ namespace TimetableDesigner.Core
     {
         #region FIELDS
 
-        private string _shortName;
         private string _description;
         private bool _isCapacityLimited;
         private uint _capacity;
@@ -23,11 +22,6 @@ namespace TimetableDesigner.Core
 
         #region PROPERTIES
 
-        public string ShortName
-        {
-            get => _shortName;
-            set => _shortName = value;
-        }
         public string Description
         {
             get => _description;
@@ -52,7 +46,6 @@ namespace TimetableDesigner.Core
 
         public Classroom(ulong id) : base(id)
         {
-            _shortName = string.Empty;
             _description = string.Empty;
             _isCapacityLimited = false;
             _capacity = 1;
diff --git a/TimetableDesigner.Core/Teacher.cs b/TimetableDesigner.Core/Teacher.cs
index 2efdb30..ccad098 100644
--- a/TimetableDesigner.Core/Teacher.cs
+++ b/TimetableDesigner.Core/Teacher.cs
@@ -12,7 +12,6 @@ namespace TimetableDesigner.Core
     {
         #region FIELDS
 
-        private string _shortName;
         private string _description;
         private JsonSerializableDictionary<TimetableDay, TimetableSpanCollection> _availabilityHours;
 
@@ -22,11 +21,6 @@ namespace TimetableDesigner.Core
 
         #region PROPERTIES
 
-        public string ShortName
-        {
-            get => _shortName;
-            set => _shortName = value;
-        }
         public string Description
         {
             get => _description;
@@ -42,7 +36,6 @@ namespace TimetableDesigner.Core
 
         public Teacher(ulong id) : base(id)
         {
-            _shortName = string.Empty;
             _description = string.Empty;
             _availabilityHours = new JsonSerializableDictionary<TimetableDay, TimetableSpanCollection>();
         }
diff --git a/TimetableDesigner.Core/Unit.cs b/TimetableDesigner.Core/Unit.cs
index f08a740..c2056d5 100644
--- a/TimetableDesigner.Core/Unit.cs
+++ b/TimetableDesigner.Core/Unit.cs
@@ -15,6 +15,7 @@ namespace TimetableDesigner.Core
         private ulong _id;
         private Guid _guid;
         private string _name;
+        private string _shortName;
 
         #endregion
 
@@ -29,6 +30,11 @@ namespace TimetableDesigner.Core
             get => _name;
             set => _name = value;
         }
+        public string ShortName
+        {
+            get => _shortName;
+            set => _shortName = value;
+        }
 
         #endregion
 
@@ -41,6 +47,7 @@ namespace TimetableDesigner.Core
             _id = id;
             _guid = Guid.NewGuid();
             _name = string.Empty;
+            _shortName = string.Empty;
         }
 
         #endregion