diff --git a/R/nba_stats_scoreboard.R b/R/nba_stats_scoreboard.R
index 46ecc16e..8fa7e68e 100644
--- a/R/nba_stats_scoreboard.R
+++ b/R/nba_stats_scoreboard.R
@@ -98,9 +98,22 @@ nba_schedule <- function(
       games <- league_sched %>%
         purrr::pluck("gameDates") %>%
         tidyr::unnest("games") %>%
-        tidyr::unnest("awayTeam", names_sep = "_") %>%
-        tidyr::unnest("homeTeam", names_sep = "_") %>%
         dplyr::select(-dplyr::any_of(c("broadcasters", "pointsLeaders"))) %>%
+        dplyr::bind_cols(
+          league_sched %>%
+            purrr::pluck("gameDates") %>%
+            tidyr::unnest("games") %>%
+            purrr::pluck("homeTeam") %>%
+            dplyr::rename_with(~paste0("home_team_", .x))
+        ) %>%
+        dplyr::bind_cols(
+          league_sched %>%
+            purrr::pluck("gameDates") %>%
+            tidyr::unnest("games") %>%
+            purrr::pluck("awayTeam") %>%
+            dplyr::rename_with(~paste0("away_team_", .x))
+        ) %>%
+        select(-homeTeam, -awayTeam) %>%
         janitor::clean_names()
       colnames(games) <- gsub('team_team', 'team', colnames(games))
       games$game_id <- unlist(purrr::map(games$game_id,function(x){
@@ -117,7 +130,7 @@ nba_schedule <- function(
             .data$season_type_id == 3 ~ "All-Star",
             .data$season_type_id == 4 ~ "Playoffs",
             .data$season_type_id == 5 ~ "Play-In Game"),
-          game_date = lubridate::mdy(substring(.data$game_date,1,10)))
+          game_date = lubridate::mdy(substring(.data$game_date, 1, 10)))
 
     },
     error = function(e) {
diff --git a/tests/testthat/test-nba_schedule.R b/tests/testthat/test-nba_schedule.R
index e9d73f44..c0905905 100644
--- a/tests/testthat/test-nba_schedule.R
+++ b/tests/testthat/test-nba_schedule.R
@@ -51,7 +51,9 @@ test_that("NBA Schedule", {
     "away_team_score",
     "away_team_seed",
     "season",
-    "league_id"
+    "league_id",
+    "season_type_id",
+    "season_type_description"
   )
 
   expect_equal(sort(colnames(x)), sort(cols_x1))