diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs
index fecd629..da1aa71 100644
--- a/Correlator/App.xaml.cs
+++ b/Correlator/App.xaml.cs
@@ -1,7 +1,6 @@
 using System.Windows;
 using Correlator.DataService;
 using Correlator.Dialog;
-using Correlator.Util;
 using Correlator.ViewModels;
 using Correlator.Views;
 using Prism.DryIoc;

diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs
index fecd629..da1aa71 100644
--- a/Correlator/App.xaml.cs
+++ b/Correlator/App.xaml.cs
@@ -1,7 +1,6 @@
 using System.Windows;
 using Correlator.DataService;
 using Correlator.Dialog;
-using Correlator.Util;
 using Correlator.ViewModels;
 using Correlator.Views;
 using Prism.DryIoc;
diff --git a/Correlator/Model/ImageFile.cs b/Correlator/Model/ImageFile.cs
new file mode 100644
index 0000000..897bd6c
--- /dev/null
+++ b/Correlator/Model/ImageFile.cs
@@ -0,0 +1,25 @@
+using Prism.Mvvm;
+
+namespace Correlator.Model
+{
+    public class ImageFile : BindableBase
+    {
+        // 序号
+        public int Order { get; set; }
+
+        // 文件名
+        public string FileName { get; set; }
+
+        // 负责人
+        public string PersonLiable { get; set; }
+
+        // 完整路径
+        public string FullPath { get; set; }
+
+        // 文件尺寸
+        public string FileSize { get; set; }
+
+        // 创建时间
+        public string CreationTime { get; set; }
+    }
+}
\ No newline at end of file

diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs
index fecd629..da1aa71 100644
--- a/Correlator/App.xaml.cs
+++ b/Correlator/App.xaml.cs
@@ -1,7 +1,6 @@
 using System.Windows;
 using Correlator.DataService;
 using Correlator.Dialog;
-using Correlator.Util;
 using Correlator.ViewModels;
 using Correlator.Views;
 using Prism.DryIoc;
diff --git a/Correlator/Model/ImageFile.cs b/Correlator/Model/ImageFile.cs
new file mode 100644
index 0000000..897bd6c
--- /dev/null
+++ b/Correlator/Model/ImageFile.cs
@@ -0,0 +1,25 @@
+using Prism.Mvvm;
+
+namespace Correlator.Model
+{
+    public class ImageFile : BindableBase
+    {
+        // 序号
+        public int Order { get; set; }
+
+        // 文件名
+        public string FileName { get; set; }
+
+        // 负责人
+        public string PersonLiable { get; set; }
+
+        // 完整路径
+        public string FullPath { get; set; }
+
+        // 文件尺寸
+        public string FileSize { get; set; }
+
+        // 创建时间
+        public string CreationTime { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Correlator/Model/ImageResultFile.cs b/Correlator/Model/ImageResultFile.cs
deleted file mode 100644
index 35cb25a..0000000
--- a/Correlator/Model/ImageResultFile.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Prism.Mvvm;
-
-namespace Correlator.Model
-{
-    public class ImageResultFile : BindableBase
-    {
-        // 序号
-        public int Order { get; set; }
-
-        // 文件名
-        public string FileName { get; set; }
-
-        // 负责人
-        public string PersonLiable { get; set; }
-
-        // 完整路径
-        public string FullPath { get; set; }
-
-        // 文件尺寸
-        public string FileSize { get; set; }
-
-        // 创建时间
-        public string CreationTime { get; set; }
-    }
-}
\ No newline at end of file

diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs
index fecd629..da1aa71 100644
--- a/Correlator/App.xaml.cs
+++ b/Correlator/App.xaml.cs
@@ -1,7 +1,6 @@
 using System.Windows;
 using Correlator.DataService;
 using Correlator.Dialog;
-using Correlator.Util;
 using Correlator.ViewModels;
 using Correlator.Views;
 using Prism.DryIoc;
diff --git a/Correlator/Model/ImageFile.cs b/Correlator/Model/ImageFile.cs
new file mode 100644
index 0000000..897bd6c
--- /dev/null
+++ b/Correlator/Model/ImageFile.cs
@@ -0,0 +1,25 @@
+using Prism.Mvvm;
+
+namespace Correlator.Model
+{
+    public class ImageFile : BindableBase
+    {
+        // 序号
+        public int Order { get; set; }
+
+        // 文件名
+        public string FileName { get; set; }
+
+        // 负责人
+        public string PersonLiable { get; set; }
+
+        // 完整路径
+        public string FullPath { get; set; }
+
+        // 文件尺寸
+        public string FileSize { get; set; }
+
+        // 创建时间
+        public string CreationTime { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Correlator/Model/ImageResultFile.cs b/Correlator/Model/ImageResultFile.cs
deleted file mode 100644
index 35cb25a..0000000
--- a/Correlator/Model/ImageResultFile.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Prism.Mvvm;
-
-namespace Correlator.Model
-{
-    public class ImageResultFile : BindableBase
-    {
-        // 序号
-        public int Order { get; set; }
-
-        // 文件名
-        public string FileName { get; set; }
-
-        // 负责人
-        public string PersonLiable { get; set; }
-
-        // 完整路径
-        public string FullPath { get; set; }
-
-        // 文件尺寸
-        public string FileSize { get; set; }
-
-        // 创建时间
-        public string CreationTime { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Correlator/Util/RuntimeCache.cs b/Correlator/Util/RuntimeCache.cs
index e91619c..a5197d0 100644
--- a/Correlator/Util/RuntimeCache.cs
+++ b/Correlator/Util/RuntimeCache.cs
@@ -47,7 +47,7 @@
         /// <summary>
         /// 水听器下发唤醒指令时间戳
         /// </summary>
-        public static byte[] HydrophoneWakeUpTimeBytes = new byte[6];
+        public static byte[] HydrophoneWakeUpTimestamp = new byte[6];
 
         /// <summary>
         /// 水听器红色信号接收器原始数据

diff --git a/Correlator/App.xaml.cs b/Correlator/App.xaml.cs
index fecd629..da1aa71 100644
--- a/Correlator/App.xaml.cs
+++ b/Correlator/App.xaml.cs
@@ -1,7 +1,6 @@
 using System.Windows;
 using Correlator.DataService;
 using Correlator.Dialog;
-using Correlator.Util;
 using Correlator.ViewModels;
 using Correlator.Views;
 using Prism.DryIoc;
diff --git a/Correlator/Model/ImageFile.cs b/Correlator/Model/ImageFile.cs
new file mode 100644
index 0000000..897bd6c
--- /dev/null
+++ b/Correlator/Model/ImageFile.cs
@@ -0,0 +1,25 @@
+using Prism.Mvvm;
+
+namespace Correlator.Model
+{
+    public class ImageFile : BindableBase
+    {
+        // 序号
+        public int Order { get; set; }
+
+        // 文件名
+        public string FileName { get; set; }
+
+        // 负责人
+        public string PersonLiable { get; set; }
+
+        // 完整路径
+        public string FullPath { get; set; }
+
+        // 文件尺寸
+        public string FileSize { get; set; }
+
+        // 创建时间
+        public string CreationTime { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Correlator/Model/ImageResultFile.cs b/Correlator/Model/ImageResultFile.cs
deleted file mode 100644
index 35cb25a..0000000
--- a/Correlator/Model/ImageResultFile.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Prism.Mvvm;
-
-namespace Correlator.Model
-{
-    public class ImageResultFile : BindableBase
-    {
-        // 序号
-        public int Order { get; set; }
-
-        // 文件名
-        public string FileName { get; set; }
-
-        // 负责人
-        public string PersonLiable { get; set; }
-
-        // 完整路径
-        public string FullPath { get; set; }
-
-        // 文件尺寸
-        public string FileSize { get; set; }
-
-        // 创建时间
-        public string CreationTime { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Correlator/Util/RuntimeCache.cs b/Correlator/Util/RuntimeCache.cs
index e91619c..a5197d0 100644
--- a/Correlator/Util/RuntimeCache.cs
+++ b/Correlator/Util/RuntimeCache.cs
@@ -47,7 +47,7 @@
         /// <summary>
         /// 水听器下发唤醒指令时间戳
         /// </summary>
-        public static byte[] HydrophoneWakeUpTimeBytes = new byte[6];
+        public static byte[] HydrophoneWakeUpTimestamp = new byte[6];
 
         /// <summary>
         /// 水听器红色信号接收器原始数据
diff --git a/Correlator/ViewModels/PictureFileViewModel.cs b/Correlator/ViewModels/PictureFileViewModel.cs
index afd3dea..de4d7bb 100644
--- a/Correlator/ViewModels/PictureFileViewModel.cs
+++ b/Correlator/ViewModels/PictureFileViewModel.cs
@@ -19,10 +19,10 @@
 
         public string Title { get; private set; } = string.Empty;
         public event Action<IDialogResult> RequestClose;
-        private List<ImageResultFile> _totalFiles;
-        private List<ImageResultFile> _pictureFiles;
+        private List<ImageFile> _totalFiles;
+        private List<ImageFile> _pictureFiles;
 
-        public List<ImageResultFile> PictureFiles
+        public List<ImageFile> PictureFiles
         {
             get => _pictureFiles;
             set
@@ -68,7 +68,7 @@
 
         #endregion
 
-        private ImageResultFile _selectedFile;
+        private ImageFile _selectedFile;
 
         public PictureFileViewModel(IDialogService dialogService)
         {
@@ -79,7 +79,7 @@
 
             ItemSelectedCommand = new DelegateCommand<DataGrid>(delegate(DataGrid dataGrid)
             {
-                _selectedFile = (ImageResultFile)dataGrid.SelectedItem;
+                _selectedFile = (ImageFile)dataGrid.SelectedItem;
             });
 
             ShowPictureCommand = new DelegateCommand(delegate
@@ -149,11 +149,11 @@
             PictureFiles = _totalFiles.Take(RuntimeCache.PerPageItemCount).ToList();
         }
 
-        private static List<ImageResultFile> GetTotalPictureFiles()
+        private static List<ImageFile> GetTotalPictureFiles()
         {
             var i = 1;
             return new DirectoryInfo(DirectoryManager.GetPictureDir()).GetFiles("*", SearchOption.AllDirectories)
-                .Select(file => new ImageResultFile
+                .Select(file => new ImageFile
                 {
                     Order = i++,
                     FileName = file.Name,