diff --git a/cuda/tracer_cuda.sh.in b/cuda/tracer_cuda.sh.in
index c0390577..3e1d5f1c 100644
--- a/cuda/tracer_cuda.sh.in
+++ b/cuda/tracer_cuda.sh.in
@@ -120,7 +120,7 @@ then
 else
   export LD_LIBRARY_PATH=$pkglibdir/cuda:$LD_LIBRARY_PATH
 fi
-export LD_PRELOAD=$libdir/libTracerCUDA.so:$LD_PRELOAD
+export LD_PRELOAD=$pkglibdir/cuda/libcuda.so:$LD_PRELOAD
 export LTTNG_UST_ALLOW_BLOCKING=1
 export LTTNG_UST_CUDA_VERBOSE=1
 if [ ! -z "$cudart" ]
@@ -136,7 +136,7 @@ then
   else
     export LD_LIBRARY_PATH=$pkglibdir/cudart:$LD_LIBRARY_PATH
   fi
-  export LD_PRELOAD=$libdir/libTracerCUDART.so:$LD_PRELOAD
+  export LD_PRELOAD=$pkglibdir/cudart/libcudart.so:$LD_PRELOAD
   export LTTNG_UST_CUDART_VERBOSE=1
 fi
 lttng start
diff --git a/hip/tracer_hip.sh.in b/hip/tracer_hip.sh.in
index ae247beb..b0faf4c5 100644
--- a/hip/tracer_hip.sh.in
+++ b/hip/tracer_hip.sh.in
@@ -82,7 +82,7 @@ then
 else
   export LD_LIBRARY_PATH=$pkglibdir/hip:$LD_LIBRARY_PATH
 fi
-export LD_PRELOAD=$libdir/libTracerHIP.so:$LD_PRELOAD
+export LD_PRELOAD=$pkglibdir/hip/libamdhip64.so:$LD_PRELOAD
 export LTTNG_UST_ALLOW_BLOCKING=1
 export LTTNG_UST_HIP_VERBOSE=1
 lttng start
diff --git a/mpi/tracer_mpi.sh.in b/mpi/tracer_mpi.sh.in
index 8dc958c8..4504009b 100644
--- a/mpi/tracer_mpi.sh.in
+++ b/mpi/tracer_mpi.sh.in
@@ -82,7 +82,7 @@ then
 else
   export LD_LIBRARY_PATH=$pkglibdir/mpi:$LD_LIBRARY_PATH
 fi
-export LD_PRELOAD=$libdir/libTracerMPI.so:$LD_PRELOAD
+export LD_PRELOAD=$pkglibdir/mpi/libmpi.so:$LD_PRELOAD
 export LTTNG_UST_ALLOW_BLOCKING=1
 export LTTNG_UST_MPI_VERBOSE=1
 lttng start
diff --git a/omp/Makefile.am b/omp/Makefile.am
index 69545c12..1d3bac2c 100644
--- a/omp/Makefile.am
+++ b/omp/Makefile.am
@@ -134,7 +134,10 @@ libompttracepoints_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/inc
 libompttracepoints_la_CFLAGS = -fPIC -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-sign-compare $(WERROR) $(LTTNG_UST_CFLAGS)
 libompttracepoints_la_LDFLAGS = $(LTTNG_UST_LIBS)
 
-lib_LTLIBRARIES = libTracerOMPT.la libOMPInterval.la
+lib_LTLIBRARIES = libTracerOMPT.la
+
+bt2dir = $(pkglibdir)/bt2
+bt2_LTLIBRARIES = libOMPInterval.la
 
 nodist_libTracerOMPT_la_SOURCES = \
 	$(OMP_PROBES_INCL) \
@@ -145,18 +148,6 @@ libTracerOMPT_la_CFLAGS = -Wall -Wextra $(WERROR) $(LTTNG_UST_CFLAGS)
 libTracerOMPT_la_LDFLAGS = $(LTTNG_UST_LIBS) -avoid-version -module ../sampling/libThapiSampling.la
 libTracerOMPT_la_LIBADD = libompttracepoints.la
 
-install-exec-hook:
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)/ompt
-	$(LN_S) -f $(DESTDIR)$(libdir)/libTracerOMPT.so $(DESTDIR)$(pkglibdir)/ompt/libompt.so
-	$(MKDIR_P) $(DESTDIR)$(pkglibdir)/bt2
-	$(LN) -f $(DESTDIR)$(libdir)/libOMPInterval.so $(DESTDIR)$(pkglibdir)/bt2/libOMPInterval.so
-
-uninstall-hook:
-	$(RM) -f $(DESTDIR)$(pkglibdir)/ompt/libompt.so
-	-rmdir $(DESTDIR)$(pkglibdir)/ompt
-	$(RM) -f $(DESTDIR)$(pkglibdir)/bt2/libOMPInterval.so
-	-rmdir $(DESTDIR)$(pkglibdir)/bt2
-
 xprof_utils.hpp: $(top_srcdir)/utils/xprof_utils.hpp
 	cp $< $@
 
diff --git a/opencl/tracer_opencl.sh.in b/opencl/tracer_opencl.sh.in
index 67a866e5..8ff8486d 100644
--- a/opencl/tracer_opencl.sh.in
+++ b/opencl/tracer_opencl.sh.in
@@ -140,7 +140,7 @@ then
 else
   export LD_LIBRARY_PATH=$pkglibdir/opencl:$LD_LIBRARY_PATH
 fi
-export LD_PRELOAD=$libdir/libTracerOpenCL.so:$LD_PRELOAD
+export LD_PRELOAD=$pkglibdir/opencl/libOpenCL.so:$LD_PRELOAD
 export LTTNG_UST_ALLOW_BLOCKING=1
 export LTTNG_UST_OPENCL_VERBOSE=1
 lttng start
diff --git a/ze/tracer_ze.sh.in b/ze/tracer_ze.sh.in
index 0185ac43..9741af9d 100644
--- a/ze/tracer_ze.sh.in
+++ b/ze/tracer_ze.sh.in
@@ -126,7 +126,7 @@ then
 else
   export LD_LIBRARY_PATH=$pkglibdir/ze:$LD_LIBRARY_PATH
 fi
-export LD_PRELOAD=$libdir/libze_loader.so:$LD_PRELOAD
+export LD_PRELOAD=$pkglibdir/ze/libze_loader.so:$LD_PRELOAD
 export LTTNG_UST_ALLOW_BLOCKING=1
 export LTTNG_UST_ZE_VERBOSE=1
 lttng start