diff --git a/config/settings.yml b/config/settings.yml
index 0413c758..a449f8ec 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -24,7 +24,7 @@ redis:
     uri: <%= ENV.fetch("REDIS_DATABASE_URI") { "redis://127.0.0.1:6379/2" } %>
 matomo_id: 11
 pickup_locations:
-  UP-PAT: 'Pattee Commons Services Desk'
+  UP-PAT: 'Pattee and Paterno Library - Commons Services Desk'
   UP-ARCHIT: 'Architecture & Landscape Architecture Library, 111 Stuckeman'
   HERSHEY: 'College of Medicine (Hershey)'
   DSL-CARL: 'Dickinson Law (Carlisle)'
@@ -34,16 +34,16 @@ pickup_locations:
   UP-PAMS: 'Physical & Mathematical Sci Lib 201 Davey Lab'
   UP-OFFICE: 'University Park Faculty/Staff/Graduate Student Office Delivery'
   ABINGTON: 'Penn State Abington'
-  ALTOONA: 'Penn State Altoona'
+  ALTOONA: 'Altoona Campus Library Pickup - Library Circulation Desk'
   BEAVER: 'Penn State Beaver'
   BEHREND: 'Penn State Erie'
-  BERKS: 'Penn State Berks'
+  BERKS: 'Berks Campus Library'
   BRANDYWINE: 'Penn State Brandywine'
   DUBOIS: 'Penn State Dubois'
   FAYETTE: 'Penn State Fayette'
   GREATVLY: 'Penn State Great Valley'
   GALLEGHENY: 'Penn State Greater Allegheny'
-  HARRISBURG: 'Penn State Harrisburg'
+  HARRISBURG: 'Harrisburg Campus Library'
   HAZLETON: 'Penn State Hazleton'
   LEHIGHVLY: 'Penn State Lehigh Valley'
   MONTALTO: 'Penn State Mont Alto'
@@ -55,30 +55,30 @@ pickup_locations:
   YORK: 'Penn State York'
   WORLD: 'World Campus'
 pickup_locations_actual:
-  ABINGTON: 'Abington'
+  ABINGTON: 'Penn State Abington'
   ACQ_DSL: 'Acquisitions (Law Schools)'
   ACQUISTNS: 'Acquisitions (UP)'
-  ALTOONA: 'Altoona'
-  BEAVER: 'Beaver'
-  BEHREND: 'Erie'
-  BERKS: 'Berks'
-  BRANDYWINE: 'Brandywine'
-  DSL-CARL: 'Dickinson Law (Carlisle)'
-  DSL-UP: 'Penn State Law (UP)'
-  DUBOIS: 'DuBois'
-  FAYETTE: 'Fayette'
-  GALLEGHENY: 'Greater Allegheny'
-  GREATVLY: 'Great Valley'
-  HARRISBURG: 'Harrisburg'
-  HAZLETON: 'Hazleton'
+  ALTOONA: 'Penn State Altoona'
+  BEAVER: 'Penn State Beaver'
+  BEHREND: 'Penn State Erie'
+  BERKS: 'Penn State Berks'
+  BRANDYWINE: 'Penn State Brandywine'
+  DSL-CARL: 'Penn State Dickinson Law (Carlisle)'
+  DSL-UP: 'Penn State Law (University Park)'
+  DUBOIS: 'Penn State DuBois'
+  FAYETTE: 'Penn State Fayette'
+  GALLEGHENY: 'Penn State Greater Allegheny'
+  GREATVLY: 'Penn State Great Valley'
+  HARRISBURG: 'Penn State Harrisburg'
+  HAZLETON: 'Penn State Hazleton'
   HERSHEY: 'Hershey (College of Medicine)'
-  LEHIGHVLY: 'Lehigh Valley'
-  MONTALTO: 'Mont Alto'
-  NEWKEN: 'New Kensington'
+  LEHIGHVLY: 'Penn State Lehigh Valley'
+  MONTALTO: 'Penn State Mont Alto'
+  NEWKEN: 'Penn State New Kensington'
   ONLINE: 'Online Resource'
-  SCHUYLKILL: 'Schuylkill'
+  SCHUYLKILL: 'Penn State Schuylkill'
   SERIAL-SRV: 'Acquisitions (UP)'
-  SHENANGO: 'Shenango'
+  SHENANGO: 'Penn State Shenango'
   UP-ANNEX: 'Library Storage'
   UP-ARCHIT: 'Architecture & Landscape Architecture Library (UP)'
   UP-ARTSHUM: 'Arts & Humanities Library (Pattee)'
@@ -96,9 +96,9 @@ pickup_locations_actual:
   UP-SOCSCI: 'Social Sciences & Education Library (Paterno)'
   UP-EDUBEHV: 'Social Sciences & Education Library (Paterno)'
   UP-SPECCOL: 'Special Collections Library (Paterno)'
-  WILKESBAR: 'Wilkes-Barre'
+  WILKESBAR: 'Penn State Wilkes-Barre'
   WITHDRAWN: 'Withdrawn'
   WORLD: 'World Campus'
-  WSCRANTON: 'Scranton'
+  WSCRANTON: 'Penn State Scranton'
   XTERNAL: 'Associated Libraries'
-  YORK: 'York'
+  YORK: 'Penn State York'
diff --git a/spec/features/holds_spec.rb b/spec/features/holds_spec.rb
index 42fc54c9..378c7e21 100644
--- a/spec/features/holds_spec.rb
+++ b/spec/features/holds_spec.rb
@@ -39,7 +39,7 @@
       context 'when the user successfully changes the pickup library of the same hold more than once' do
         it 'success badges gets cleared each time', js: true do
           page.check 'hold_list__3911148'
-          page.select 'Penn State Berks', from: 'pickup_library'
+          page.select 'Berks Campus Library', from: 'pickup_library'
           page.click_button 'Update Selected Holds'
 
           expect(page).to have_css '.badge-success', text: 'Successfully changed pickup location', count: 1
diff --git a/spec/helpers/holds_helper_spec.rb b/spec/helpers/holds_helper_spec.rb
index 1ee8a686..0bba17b0 100644
--- a/spec/helpers/holds_helper_spec.rb
+++ b/spec/helpers/holds_helper_spec.rb
@@ -156,7 +156,7 @@
   describe '#render_pickup_library' do
     it 'returns an html select list with the patron\s default library selected' do
       expect(helper.render_pickup_libraries('UP-PAT')).to include '<option selected="selected" value="UP-PAT">'\
-                                                                          'Pattee Commons Services Desk</option>'
+                                            'Pattee and Paterno Library - Commons Services Desk</option>'
     end
 
     it 'returns an html select list with a blank option as selected when selected is not a pickup location' do