diff --git a/xrdp_accel_assist/Makefile.am b/xrdp_accel_assist/Makefile.am
index d754ecabe..02aabb8cb 100644
--- a/xrdp_accel_assist/Makefile.am
+++ b/xrdp_accel_assist/Makefile.am
@@ -10,7 +10,7 @@ if XRDP_NVENC
 AM_CPPFLAGS += -DXRDP_NVENC
 AM_CPPFLAGS += $(XRDP_NVENC_CFLAGS)
 XRDP_EXTRA_LIBS += $(XRDP_NVENC_LIBS)
-XRDP_EXTRA_SOURCES += xrdp_accel_assist_nvenc.c xrdp_accel_assist_nvenc.h encoder_headers/nvEncodeAPI.h
+XRDP_EXTRA_SOURCES += xrdp_accel_assist_nvenc.c xrdp_accel_assist_nvenc.h encoder_headers/nvEncodeAPI_11_1.h
 endif
 
 if XRDP_YAMI
@@ -20,8 +20,8 @@ XRDP_EXTRA_LIBS += $(XRDP_YAMI_LIBS)
 XRDP_EXTRA_SOURCES += xrdp_accel_assist_yami.c xrdp_accel_assist_yami.h encoder_headers/yami_inf.h
 endif
 
-bin_PROGRAMS = \
-  xrdp_accel_assist
+pkglibexec_PROGRAMS = \
+  xrdp-accel-assist
 
 xrdp_accel_assist_SOURCES = \
   xrdp_accel_assist.c \
diff --git a/xrdp_accel_assist/xrdp_accel_assist.c b/xrdp_accel_assist/xrdp_accel_assist.c
index 62b4e8375..22e88c7f0 100644
--- a/xrdp_accel_assist/xrdp_accel_assist.c
+++ b/xrdp_accel_assist/xrdp_accel_assist.c
@@ -899,9 +899,9 @@ xrdp_accel_assist_setup_log(void)
     {
         get_display_num_from_display(display_text);
     }
-    g_snprintf(log_file, 255, "%s/xrdp_accel_assist.%d.log", log_path,
+    g_snprintf(log_file, 255, "%s/xrdp-accel-assist.%d.log", log_path,
                g_display_num);
-    g_writeln("xrdp_accel_assist::xrdp_accel_assist_setup_log: using "
+    g_writeln("xrdp-accel-assist::xrdp_accel_assist_setup_log: using "
               "log file [%s]", log_file);
     if (g_file_exist(log_file))
     {