diff --git a/MECF.Framework.UI.Client/ClientBase/ModuleDataMonitor.cs b/MECF.Framework.UI.Client/ClientBase/ModuleDataMonitor.cs
index 8854c51..fe62554 100644
--- a/MECF.Framework.UI.Client/ClientBase/ModuleDataMonitor.cs
+++ b/MECF.Framework.UI.Client/ClientBase/ModuleDataMonitor.cs
@@ -96,7 +96,7 @@ namespace MECF.Framework.UI.Client.ClientBase
                                     {
                                         info.WaferManager.Wafers[i].SourceName = convertedWafer.SourceName;
                                     }
-                                    info.WaferManager.Wafers[i].WaferTrayStatus = convertedWafer.WaferTrayStatus;
+                                    info.WaferManager.Wafers[i].TrayStatus = convertedWafer.TrayStatus;
                                     info.WaferManager.Wafers[i].LotID = convertedWafer.LotID;
                                     info.WaferManager.Wafers[i].IsTrayExhausted = wafers[index].TrayProcessCount <= 0;
                                     info.WaferManager.Wafers[i].TrayProcessCount = wafers[index].TrayProcessCount;
@@ -152,7 +152,7 @@ namespace MECF.Framework.UI.Client.ClientBase
             wafer.SourceName = awafer.WaferOrigin;
             wafer.LotID = awafer.LotId == "" ? awafer.WaferOrigin : awafer.LotId;
             wafer.WaferStatus = WaferStatusConverter(awafer);
-            wafer.WaferTrayStatus = (int)awafer.TrayStatus; //awafer.TrayState == RTDefine.WaferTrayStatus.Normal ? 1 : 0;
+            wafer.TrayStatus = (int)awafer.TrayStatus; //awafer.TrayState == RTDefine.TrayStatus.Normal ? 1 : 0;
             wafer.RecipeName = "";
             if (awafer.ProcessJob != null && awafer.ProcessJob.Sequence != null)
             {
diff --git a/MECF.Framework.UI.Client/ClientBase/WaferInfo.cs b/MECF.Framework.UI.Client/ClientBase/WaferInfo.cs
index a83bb3f..b54d94e 100644
--- a/MECF.Framework.UI.Client/ClientBase/WaferInfo.cs
+++ b/MECF.Framework.UI.Client/ClientBase/WaferInfo.cs
@@ -14,7 +14,7 @@ namespace MECF.Framework.UI.Client.ClientBase
         }
 
         private int _waferTrayStatus = 0;
-        public int WaferTrayStatus
+        public int TrayStatus
         {
             get => _waferTrayStatus;
             set { _waferTrayStatus = value; NotifyOfPropertyChange(); }
diff --git a/MECF.Framework.UI.Client/Ctrlib/UnitControls/FOUPFrontView.xaml b/MECF.Framework.UI.Client/Ctrlib/UnitControls/FOUPFrontView.xaml
index e4f0359..d06635e 100644
--- a/MECF.Framework.UI.Client/Ctrlib/UnitControls/FOUPFrontView.xaml
+++ b/MECF.Framework.UI.Client/Ctrlib/UnitControls/FOUPFrontView.xaml
@@ -121,12 +121,12 @@
                                                 ToolTip="{Binding ToolTip}"
                                                 ToolTipService.ShowOnDisabled="True"
                                                 TrayProcessCount="{Binding TrayProcessCount}"
-                                                TrayStatus="{Binding WaferTrayStatus}"
+                                                TrayStatus="{Binding TrayStatus}"
                                                 ViewType="Front">
                                                 <controls:Slot.WaferStatus>
                                                     <MultiBinding Converter="{StaticResource WaferTrayStatusConvert}">
                                                         <Binding Path="WaferStatus" />
-                                                        <Binding Path="WaferTrayStatus" />
+                                                        <Binding Path="TrayStatus" />
                                                     </MultiBinding>
                                                 </controls:Slot.WaferStatus>
                                                 <i:Interaction.Triggers>
diff --git a/MECF.Framework.UI.Client/SicModuleUIViewModelBase.cs b/MECF.Framework.UI.Client/SicModuleUIViewModelBase.cs
index 61c1e2c..1d66266 100644
--- a/MECF.Framework.UI.Client/SicModuleUIViewModelBase.cs
+++ b/MECF.Framework.UI.Client/SicModuleUIViewModelBase.cs
@@ -121,7 +121,7 @@ namespace MECF.Framework.UI.Client
         {
             get
             {
-                if (ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers[0].WaferTrayStatus > 0)
+                if (ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TrayRobot"].WaferManager.Wafers[0].TrayStatus > 0)
                 {
                     return Visibility.Visible;
                 }
@@ -133,7 +133,7 @@ namespace MECF.Framework.UI.Client
         {
             get
             {
-                if (ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0].WaferTrayStatus > 0)
+                if (ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["TMRobot"].WaferManager.Wafers[0].TrayStatus > 0)
                 {
                     return Visibility.Visible;
                 }
@@ -145,7 +145,7 @@ namespace MECF.Framework.UI.Client
         {
             get
             {
-                if (ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers[0].WaferTrayStatus > 0)
+                if (ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["LoadLock"].WaferManager.Wafers[0].TrayStatus > 0)
                 {
                     return Visibility.Visible;
                 }
@@ -157,7 +157,7 @@ namespace MECF.Framework.UI.Client
         {
             get
             {
-                if (ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers[0].WaferTrayStatus > 0)
+                if (ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["UnLoad"].WaferManager.Wafers[0].TrayStatus > 0)
                 {
                     return Visibility.Visible;
                 }
@@ -169,7 +169,7 @@ namespace MECF.Framework.UI.Client
         {
             get
             {
-                if (ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers[0].WaferTrayStatus > 0)
+                if (ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM1"].WaferManager.Wafers[0].TrayStatus > 0)
                 {
                     return Visibility.Visible;
                 }
@@ -181,7 +181,7 @@ namespace MECF.Framework.UI.Client
         {
             get
             {
-                if (ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers[0].WaferTrayStatus > 0)
+                if (ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers.Count > 0 && ModuleManager.ModuleInfos["PM2"].WaferManager.Wafers[0].TrayStatus > 0)
                 {
                     return Visibility.Visible;
                 }