diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
index 5ca9dc6ba..329a4f2d7 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
@@ -452,8 +452,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             }
 
             zipStream.Position = 0;
-
-            var code = string.Concat(currentTask.Subject.Code.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
+            var subjectCode = (currentTask.BlindSubjectCode.IsNullOrEmpty() ? currentTask.Subject.Code : currentTask.BlindSubjectCode);
+            var code = string.Concat(subjectCode.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
             return new FileStreamResult(zipStream, "application/zip")
             {
                 FileDownloadName = code+"_IVUS_Templates.zip"
@@ -540,8 +540,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         private static string GetTemplateFileName(VisitTask task)
         {
-            var subjectCode = task.Subject.Code;
-            var fileName = $"{subjectCode}_{task.TaskName}";
+            var subjectCode = (task.BlindSubjectCode.IsNullOrEmpty() ? task.Subject.Code : task.BlindSubjectCode);
+            var fileName = $"{subjectCode}_{task.TaskBlindName}";
             return string.Concat(fileName.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
         }
 
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
index 17e570645..46359c855 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
@@ -311,8 +311,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             }
 
             zipStream.Position = 0;
-
-            var code = string.Concat(currentTask.Subject.Code.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
+            var subjectCode = (currentTask.BlindSubjectCode.IsNullOrEmpty() ? currentTask.Subject.Code : currentTask.BlindSubjectCode);
+            var code = string.Concat(subjectCode.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
             return new FileStreamResult(zipStream, "application/zip")
             {
                 FileDownloadName = $"{code}_OCT_FCT_Templates.zip"
@@ -395,8 +395,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
         private static string GetTemplateFileName(VisitTask task)
         {
-            var subjectCode = task.Subject.Code;
-            var fileName = $"{subjectCode}_{task.TaskName}";
+            var subjectCode = (task.BlindSubjectCode.IsNullOrEmpty() ? task.Subject.Code : task.BlindSubjectCode);
+            var fileName = $"{subjectCode}_{task.TaskBlindName}";
             return string.Concat(fileName.Select(c => Path.GetInvalidFileNameChars().Contains(c) ? '_' : c));
         }