diff --git a/fastf1/tests/test_core.py b/fastf1/tests/test_core.py
index 60d450a24..561e23c12 100644
--- a/fastf1/tests/test_core.py
+++ b/fastf1/tests/test_core.py
@@ -26,7 +26,7 @@ def test_lap_data_loading_position_calculation():
         ]['driverCode'].iloc[0]
 
         erg_drv_laps = ergast_laps[ergast_laps['driverId'] == drv_id]
-        drv_laps = session.laps.pick_driver(abb)
+        drv_laps = session.laps.pick_drivers(abb)
 
         # subtract per-lap positions between the data sources
         delta = erg_drv_laps['position'].reset_index(drop=True) \
diff --git a/fastf1/tests/test_example_plots.py b/fastf1/tests/test_example_plots.py
index 171811e01..0c8ee556e 100644
--- a/fastf1/tests/test_example_plots.py
+++ b/fastf1/tests/test_example_plots.py
@@ -18,8 +18,8 @@ def test_readme_example():
     session = fastf1.get_session(2020, 'Belgian', 'R')
     session.load()
 
-    lec = session.laps.pick_driver('LEC')
-    ham = session.laps.pick_driver('HAM')
+    lec = session.laps.pick_drivers('LEC')
+    ham = session.laps.pick_drivers('HAM')
 
     fig, ax = plt.subplots()
     ax.plot(lec['LapNumber'], lec['LapTime'], color='red')
@@ -37,7 +37,7 @@ def test_doc_example_fast_lec():
     session = fastf1.get_session(2020, 'Belgian', 'R')
 
     session.load()
-    fast_leclerc = session.laps.pick_driver('LEC').pick_fastest()
+    fast_leclerc = session.laps.pick_drivers('LEC').pick_fastest()
     t = fast_leclerc.telemetry['Time']
     vCar = fast_leclerc.telemetry['Speed']
 
@@ -56,8 +56,8 @@ def test_doc_example_fast_lec():
 def test_doc_example_delta_time():
     session = fastf1.get_session(2020, 'Belgian', 'R')
     session.load()
-    lec = session.laps.pick_driver('LEC').pick_fastest()
-    ham = session.laps.pick_driver('HAM').pick_fastest()
+    lec = session.laps.pick_drivers('LEC').pick_fastest()
+    ham = session.laps.pick_drivers('HAM').pick_fastest()
 
     fig, ax = plt.subplots()
     ax.plot(lec.telemetry['Distance'], lec.telemetry['Speed'],
diff --git a/fastf1/tests/test_input_data_handling.py b/fastf1/tests/test_input_data_handling.py
index 1d657c74b..108f8f0e6 100644
--- a/fastf1/tests/test_input_data_handling.py
+++ b/fastf1/tests/test_input_data_handling.py
@@ -49,7 +49,7 @@ def test_crash_lap_added_1():
     session = fastf1.get_session(2021, "Monza", 'FP2')
 
     session.load(telemetry=False)
-    assert session.laps.pick_driver('SAI').shape[0] == 14
+    assert session.laps.pick_drivers('SAI').shape[0] == 14
 
 
 @pytest.mark.f1telapi
@@ -58,7 +58,7 @@ def test_crash_lap_added_2():
     session = fastf1.get_session(2021, 'British Grand Prix', 'R')
 
     session.load(telemetry=False)
-    assert session.laps.pick_driver('VER').shape[0] == 1
+    assert session.laps.pick_drivers('VER').shape[0] == 1
 
 
 @pytest.mark.f1telapi
@@ -69,7 +69,7 @@ def test_no_extra_lap_if_race_not_started():
 
     session.load(telemetry=False, weather=False)
     assert session.laps.size
-    assert session.laps.pick_driver('TSU').size == 0
+    assert session.laps.pick_drivers('TSU').size == 0
 
 
 @pytest.mark.f1telapi
@@ -106,7 +106,7 @@ def test_inlap_added():
     session = fastf1.get_session(2021, 'Mexico City', 'Q')
     session.load(telemetry=False)
 
-    last = session.laps.pick_driver('PER').iloc[-1]
+    last = session.laps.pick_drivers('PER').iloc[-1]
     assert not pd.isnull(last['PitInTime'])
     assert not pd.isnull(last['Time'])
 
@@ -121,7 +121,7 @@ def test_lap_start_time_after_red_flag():
 
     # ensure that verstappens first lap after the restart was also started
     # after the restart
-    ver_laps = session.laps.pick_driver('VER')
+    ver_laps = session.laps.pick_drivers('VER')
     idx = ver_laps[(ver_laps['Time'] > restart_time)
                    & pd.notna(ver_laps['Time'])].index[0]
     assert ver_laps.loc[idx]['LapStartTime'] > restart_time
@@ -133,7 +133,7 @@ def test_partial_lap_retired_added():
     session = fastf1.get_session(2022, 1, 'R')
     session.load()
 
-    assert session.laps.pick_driver('11').iloc[-1]['FastF1Generated']
+    assert session.laps.pick_drivers('11').iloc[-1]['FastF1Generated']
 
 
 @pytest.mark.f1telapi
@@ -147,7 +147,7 @@ def test_partial_lap_retired_not_added_after_finished():
     session = fastf1.get_session(2021, 21, 'R')
     session.load()
 
-    assert (session.laps.pick_driver('HAM')['LapNumber'].max()
+    assert (session.laps.pick_drivers('HAM')['LapNumber'].max()
             == session.total_laps)
 
 
@@ -156,7 +156,7 @@ def test_first_lap_time_added_from_ergast_in_race():
     session = fastf1.get_session(2022, 1, 'R')
     session.load(telemetry=False)
 
-    assert not pd.isna(session.laps.pick_lap(1)['LapTime']).any()
+    assert not pd.isna(session.laps.pick_laps(1)['LapTime']).any()
 
 
 @pytest.mark.f1telapi
@@ -166,12 +166,12 @@ def test_consecutive_equal_lap_times():
     # by calculating the lap time from the sector times.
     session = fastf1.get_session(2023, 1, 'R')
     session.load(telemetry=False, weather=False)
-    lt = session.laps.pick_driver('16')
+    lt = session.laps.pick_drivers('16')
 
-    assert lt.pick_lap(37)['LapTime'].iloc[0] == pd.Timedelta(seconds=97.170)
+    assert lt.pick_laps(37)['LapTime'].iloc[0] == pd.Timedelta(seconds=97.170)
 
-    assert lt.pick_lap(37)['LapTime'].iloc[0] \
-           == lt.pick_lap(38)['LapTime'].iloc[0]
+    assert lt.pick_laps(37)['LapTime'].iloc[0] \
+           == lt.pick_laps(38)['LapTime'].iloc[0]
 
 
 @pytest.mark.f1telapi
@@ -182,12 +182,12 @@ def test_consecutive_equal_sector_times():
     # times.
     session = fastf1.get_session(2023, 1, 'R')
     session.load(telemetry=False, weather=False)
-    lt = session.laps.pick_driver('21')
+    lt = session.laps.pick_drivers('21')
 
-    assert lt.pick_lap(20)['Sector1Time'].iloc[0] \
+    assert lt.pick_laps(20)['Sector1Time'].iloc[0] \
            == pd.Timedelta(seconds=31.442)
-    assert lt.pick_lap(19)['Sector1Time'].iloc[0] \
-           == lt.pick_lap(20)['Sector1Time'].iloc[0]
+    assert lt.pick_laps(19)['Sector1Time'].iloc[0] \
+           == lt.pick_laps(20)['Sector1Time'].iloc[0]
 
 
 @pytest.mark.f1telapi
@@ -213,8 +213,8 @@ def test_laps_aligned_across_drivers():
     }
 
     leader = session.results['DriverNumber'].iloc[0]
-    leader_time = session.laps.pick_driver(leader).iloc[-1]['Time']
+    leader_time = session.laps.pick_drivers(leader).iloc[-1]['Time']
     finished = (session.results['Status'] == 'Finished')
     for drv in session.results.loc[finished, 'DriverNumber'].iloc[1:]:
-        other_time = session.laps.pick_driver(drv).iloc[-1]['Time']
+        other_time = session.laps.pick_drivers(drv).iloc[-1]['Time']
         assert (other_time - leader_time) == ref[drv]
diff --git a/fastf1/tests/test_laps.py b/fastf1/tests/test_laps.py
index 5d97326f0..ebf4bac04 100644
--- a/fastf1/tests/test_laps.py
+++ b/fastf1/tests/test_laps.py
@@ -42,17 +42,17 @@ def test_dtypes_default_columns():
 def test_dtypes_pick(reference_laps_data):
     session, laps = reference_laps_data
     drv = list(laps['Driver'].unique())[1]  # some driver
-    ensure_data_type(LAP_DTYPES, laps.pick_driver(drv))
+    ensure_data_type(LAP_DTYPES, laps.pick_drivers(drv))
     ensure_data_type(LAP_DTYPES, laps.pick_quicklaps())
     ensure_data_type(LAP_DTYPES, laps.iloc[:2])
     ensure_data_type(LAP_DTYPES,
-                     laps.pick_driver(drv).iloc[:3].pick_quicklaps())
+                     laps.pick_drivers(drv).iloc[:3].pick_quicklaps())
 
 
 @pytest.mark.f1telapi
 def test_laps_get_car_data(reference_laps_data):
     session, laps = reference_laps_data
-    drv_laps = laps.pick_driver('BOT')
+    drv_laps = laps.pick_drivers('BOT')
     car = drv_laps.get_car_data()
     assert car.shape == (26559, 10)
     assert not car.isna().sum().sum()  # sum rows then columns
@@ -64,7 +64,7 @@ def test_laps_get_car_data(reference_laps_data):
 @pytest.mark.f1telapi
 def test_laps_get_pos_data(reference_laps_data):
     session, laps = reference_laps_data
-    drv_laps = laps.pick_driver('BOT')
+    drv_laps = laps.pick_drivers('BOT')
     pos = drv_laps.get_pos_data()
     assert pos.shape == (29330, 8)
     assert not pos.isna().sum().sum()
@@ -76,7 +76,7 @@ def test_laps_get_pos_data(reference_laps_data):
 @pytest.mark.f1telapi
 def test_laps_get_telemetry(reference_laps_data):
     session, laps = reference_laps_data
-    drv_laps = laps.pick_driver('BOT')
+    drv_laps = laps.pick_drivers('BOT')
     tel = drv_laps.get_telemetry()
     assert tel.shape == (55788, 18)
     assert not tel.isna().sum().sum()
diff --git a/fastf1/tests/test_telemetry.py b/fastf1/tests/test_telemetry.py
index 68f883a51..15cf53dd5 100644
--- a/fastf1/tests/test_telemetry.py
+++ b/fastf1/tests/test_telemetry.py
@@ -143,7 +143,7 @@ def test_slice_by_lap(reference_laps_data):
     session, laps = reference_laps_data
     drv = list(session.car_data.keys())[1]  # some driver
     test_data = session.car_data[drv]
-    test_laps = laps.pick_driver(drv)
+    test_laps = laps.pick_drivers(drv)
 
     lap2 = test_laps[test_laps['LapNumber'] == 2].iloc[0]
     lap3 = test_laps[test_laps['LapNumber'] == 3].iloc[0]
@@ -302,7 +302,7 @@ def test_add_driver_ahead_resampled(reference_laps_data):
 def test_add_track_status(reference_laps_data):
     session, laps = reference_laps_data
 
-    test_data = laps.pick_driver('VER').get_telemetry()
+    test_data = laps.pick_drivers('VER').get_telemetry()
     test_data = test_data.add_track_status()
 
     # Get statuses