diff --git a/PARR.DAL/DomainServices/Implementations/ShortcodesService.cs b/PARR.DAL/DomainServices/Implementations/ShortcodesService.cs
index 690f43aa..007b4286 100644
--- a/PARR.DAL/DomainServices/Implementations/ShortcodesService.cs
+++ b/PARR.DAL/DomainServices/Implementations/ShortcodesService.cs
@@ -31,7 +31,11 @@ namespace PARR.DAL.DomainServices.Implementations
 
             var nameConstants = settingsFromDb.TemplateNameConstantPartsList;
 
-            var job = await jobService.Get().AsNoTracking().FirstOrDefaultAsync(t => t.Id == jobId);
+            var job = await jobService
+                                .Get().AsNoTracking()
+                                .Include(t=>t.Tnk)
+                                .FirstOrDefaultAsync(t => t.Id == jobId);
+
             var unit = await unitService.Get().AsNoTracking().FirstOrDefaultAsync(t => t.Id == unitId);
 
             if (job != null && unit != null && job.TemplateNameMask != null)
@@ -104,6 +108,10 @@ namespace PARR.DAL.DomainServices.Implementations
 
             if (shortcodesInMask.Any(x => x.Value == "%ЭК%"))
                 resultName = resultName.Replace("%ЭК%", unit.Name);
+
+            if (shortcodesInMask.Any(x => x.Value == "%ТНК%"))
+                resultName = resultName.Replace("%ТНК%", job.Tnk!.Name);
+
             return resultName;
         }
 
@@ -129,8 +137,8 @@ namespace PARR.DAL.DomainServices.Implementations
         {
             var result = new List<string> {
                 "%ЭК%",
-                "%ЗО%",
-                "%РАБОТА%"
+                "%РАБОТА%",
+                "%ТНК%"
             };
 
             return result;