1 files changed, 12 insertions, 12 deletions

diff --git a/core/src/dird/expand.cc b/core/src/dird/expand.cc
index a89f3f520..5a4cdea00 100644
--- a/core/src/dird/expand.cc
+++ b/core/src/dird/expand.cc
@@ -30,7 +30,7 @@
 #include "include/bareos.h"
 #include "dird.h"
 #include "dird/dird_globals.h"
-#include "dird/jcr_private.h"
+#include "dird/director_jcr_impl.h"
 #include "lib/parse_conf.h"
 #include "lib/util.h"
 #include "lib/output_formatter.h"
@@ -92,7 +92,7 @@ static int job_item(JobControlRecord* jcr,
 
   switch (code) {
     case 1: /* Job */
-      str = jcr->impl->res.job->resource_name_;
+      str = jcr->dir_impl->res.job->resource_name_;
       break;
     case 2: /* Director's name */
       str = my_name;
@@ -108,31 +108,31 @@ static int job_item(JobControlRecord* jcr,
       str = buf;
       break;
     case 6: /* Client */
-      str = jcr->impl->res.client->resource_name_;
+      str = jcr->dir_impl->res.client->resource_name_;
       if (!str) { str = " "; }
       break;
     case 7: /* NumVols */
-      Bsnprintf(buf, sizeof(buf), "%d", jcr->impl->NumVols);
+      Bsnprintf(buf, sizeof(buf), "%d", jcr->dir_impl->NumVols);
       str = buf;
       break;
     case 8: /* Pool */
-      str = jcr->impl->res.pool->resource_name_;
+      str = jcr->dir_impl->res.pool->resource_name_;
       break;
     case 9: /* Storage */
-      if (jcr->impl->res.write_storage) {
-        str = jcr->impl->res.write_storage->resource_name_;
+      if (jcr->dir_impl->res.write_storage) {
+        str = jcr->dir_impl->res.write_storage->resource_name_;
       } else {
-        str = jcr->impl->res.read_storage->resource_name_;
+        str = jcr->dir_impl->res.read_storage->resource_name_;
       }
       break;
     case 10: /* Catalog */
-      str = jcr->impl->res.catalog->resource_name_;
+      str = jcr->dir_impl->res.catalog->resource_name_;
       break;
     case 11: /* MediaType */
-      if (jcr->impl->res.write_storage) {
-        str = jcr->impl->res.write_storage->media_type;
+      if (jcr->dir_impl->res.write_storage) {
+        str = jcr->dir_impl->res.write_storage->media_type;
       } else {
-        str = jcr->impl->res.read_storage->media_type;
+        str = jcr->dir_impl->res.read_storage->media_type;
       }
       break;
     case 12: /* JobName */