diff --git a/R/tm_a_pca.R b/R/tm_a_pca.R
index ba02a651b..e888a1d1c 100644
--- a/R/tm_a_pca.R
+++ b/R/tm_a_pca.R
@@ -258,7 +258,7 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
       response[[i]]$select$choices <- var_labels(data[[response[[i]]$dataname]]())
       response[[i]]$select$choices <- setdiff(
         response[[i]]$select$choices,
-        unlist(get_join_keys(data)$get(response[[i]]$dataname))
+        unlist(teal.data::get_join_keys(data)$get(response[[i]]$dataname))
       )
     }
 
@@ -324,7 +324,7 @@ srv_a_pca <- function(id, data, reporter, filter_panel_api, dat, plot_height, pl
     anl_merged_input <- teal.transform::merge_expression_srv(
       selector_list = selector_list,
       datasets = data,
-      join_keys = get_join_keys(data)
+      join_keys = teal.data::get_join_keys(data)
     )
 
     anl_merged_q <- reactive({
diff --git a/R/tm_a_regression.R b/R/tm_a_regression.R
index 2a6418716..9688d14c3 100644
--- a/R/tm_a_regression.R
+++ b/R/tm_a_regression.R
@@ -295,7 +295,7 @@ srv_a_regression <- function(id,
     anl_merged_input <- teal.transform::merge_expression_srv(
       selector_list = selector_list,
       datasets = data,
-      join_keys = get_join_keys(data)
+      join_keys = teal.data::get_join_keys(data)
     )
 
     regression_var <- reactive({
diff --git a/R/tm_g_association.R b/R/tm_g_association.R
index f3820212c..f91175748 100644
--- a/R/tm_g_association.R
+++ b/R/tm_g_association.R
@@ -251,7 +251,7 @@ srv_tm_g_association <- function(id,
     anl_merged_input <- teal.transform::merge_expression_srv(
       datasets = data,
       selector_list = selector_list,
-      join_keys = get_join_keys(data)
+      join_keys = teal.data::get_join_keys(data)
     )
 
     anl_merged_q <- reactive({
diff --git a/R/tm_g_bivariate.R b/R/tm_g_bivariate.R
index 7bf003a2e..39453c210 100644
--- a/R/tm_g_bivariate.R
+++ b/R/tm_g_bivariate.R
@@ -441,7 +441,7 @@ srv_g_bivariate <- function(id,
     anl_merged_input <- teal.transform::merge_expression_srv(
       selector_list = selector_list,
       datasets = data,
-      join_keys = get_join_keys(data)
+      join_keys = teal.data::get_join_keys(data)
     )
 
     anl_merged_q <- reactive({
diff --git a/R/tm_g_distribution.R b/R/tm_g_distribution.R
index a5181754b..4efd3f82f 100644
--- a/R/tm_g_distribution.R
+++ b/R/tm_g_distribution.R
@@ -447,7 +447,7 @@ srv_distribution <- function(id,
     anl_merged_input <- teal.transform::merge_expression_srv(
       selector_list = selector_list,
       datasets = data,
-      join_keys = get_join_keys(data)
+      join_keys = teal.data::get_join_keys(data)
     )
 
     anl_merged_q <- reactive({
diff --git a/R/tm_g_response.R b/R/tm_g_response.R
index 01ce93621..295951c60 100644
--- a/R/tm_g_response.R
+++ b/R/tm_g_response.R
@@ -278,7 +278,7 @@ srv_g_response <- function(id,
     anl_merged_input <- teal.transform::merge_expression_srv(
       selector_list = selector_list,
       datasets = data,
-      join_keys = get_join_keys(data)
+      join_keys = teal.data::get_join_keys(data)
     )
 
     anl_merged_q <- reactive({
diff --git a/R/tm_g_scatterplot.R b/R/tm_g_scatterplot.R
index 2022f05c2..3fb5b1308 100644
--- a/R/tm_g_scatterplot.R
+++ b/R/tm_g_scatterplot.R
@@ -471,7 +471,7 @@ srv_g_scatterplot <- function(id,
     anl_merged_input <- teal.transform::merge_expression_srv(
       selector_list = selector_list,
       datasets = data,
-      join_keys = get_join_keys(data),
+      join_keys = teal.data::get_join_keys(data),
       merge_function = "dplyr::inner_join"
     )
 
diff --git a/R/tm_g_scatterplotmatrix.R b/R/tm_g_scatterplotmatrix.R
index ec60ba094..e77b33004 100644
--- a/R/tm_g_scatterplotmatrix.R
+++ b/R/tm_g_scatterplotmatrix.R
@@ -180,7 +180,7 @@ srv_g_scatterplotmatrix <- function(id, data, reporter, filter_panel_api, variab
 
     anl_merged_input <- teal.transform::merge_expression_srv(
       datasets = data,
-      join_keys = get_join_keys(data),
+      join_keys = teal.data::get_join_keys(data),
       selector_list = selector_list
     )
 
diff --git a/R/tm_missing_data.R b/R/tm_missing_data.R
index 835982543..39e38d442 100644
--- a/R/tm_missing_data.R
+++ b/R/tm_missing_data.R
@@ -356,7 +356,7 @@ srv_missing_data <- function(id, data, reporter, filter_panel_api, dataname, par
   moduleServer(id, function(input, output, session) {
     prev_group_by_var <- reactiveVal("")
     data_r <- data[[dataname]]
-    data_keys <- reactive(get_join_keys(data)$get(dataname)[[dataname]])
+    data_keys <- reactive(teal.data::get_join_keys(data)$get(dataname)[[dataname]])
 
     iv_r <- reactive({
       iv <- shinyvalidate::InputValidator$new()
@@ -395,7 +395,7 @@ srv_missing_data <- function(id, data, reporter, filter_panel_api, dataname, par
 
     data_parent_keys <- reactive({
       if (length(parent_dataname) > 0 && parent_dataname %in% names(data)) {
-        keys <- get_join_keys(data)$get(dataname)
+        keys <- teal.data::get_join_keys(data)$get(dataname)
         if (parent_dataname %in% names(keys)) {
           keys[[parent_dataname]]
         } else {
diff --git a/R/tm_outliers.R b/R/tm_outliers.R
index 59004e1cd..8ca3ab8fa 100644
--- a/R/tm_outliers.R
+++ b/R/tm_outliers.R
@@ -294,7 +294,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
     anl_merged_input <- teal.transform::merge_expression_srv(
       selector_list = reactive_select_input,
       datasets = data,
-      join_keys = get_join_keys(data),
+      join_keys = teal.data::get_join_keys(data),
       merge_function = "dplyr::inner_join"
     )
 
@@ -477,7 +477,7 @@ srv_outliers <- function(id, data, reporter, filter_panel_api, outlier_var,
           },
           env = list(
             dataname = as.name(dataname_first),
-            join_keys = as.character(get_join_keys(data)$get(dataname_first)[[dataname_first]])
+            join_keys = as.character(teal.data::get_join_keys(data)$get(dataname_first)[[dataname_first]])
           )
         )
       )
diff --git a/R/tm_t_crosstable.R b/R/tm_t_crosstable.R
index afbb85f33..bc69309b9 100644
--- a/R/tm_t_crosstable.R
+++ b/R/tm_t_crosstable.R
@@ -219,7 +219,7 @@ srv_t_crosstable <- function(id, data, reporter, filter_panel_api, label, x, y,
 
     anl_merged_input <- teal.transform::merge_expression_srv(
       datasets = data,
-      join_keys = get_join_keys(data),
+      join_keys = teal.data::get_join_keys(data),
       selector_list = selector_list,
       merge_function = merge_function
     )
diff --git a/R/tm_variable_browser.R b/R/tm_variable_browser.R
index 2fadbf944..192030347 100644
--- a/R/tm_variable_browser.R
+++ b/R/tm_variable_browser.R
@@ -1149,9 +1149,9 @@ render_tab_header <- function(dataset_name, output, data) {
   dataset_ui_id <- paste0("dataset_summary_", dataset_name)
   output[[dataset_ui_id]] <- renderText({
     df <- data[[dataset_name]]()
-    join_keys <- get_join_keys(data)
+    join_keys <- teal.data::get_join_keys(data)
     if (!is.null(join_keys)) {
-      key <- get_join_keys(data)$get(dataset_name)[[dataset_name]]
+      key <- teal.data::get_join_keys(data)$get(dataset_name)[[dataset_name]]
     } else {
       key <- NULL
     }
@@ -1222,7 +1222,7 @@ render_tab_table <- function(dataset_name, parent_dataname, output, data, input,
       # get icons proper for the data types
       icons <- stats::setNames(teal.slice:::variable_types(df), colnames(df))
 
-      join_keys <- get_join_keys(data)
+      join_keys <- teal.data::get_join_keys(data)
       if (!is.null(join_keys)) {
         icons[intersect(join_keys$get(dataset_name)[[dataset_name]], colnames(df))] <- "primary_key"
       }