diff --git a/packages/pg-v5/commands/credentials.js b/packages/pg-v5/commands/credentials.js
index 825321bec9..2729d1253a 100644
--- a/packages/pg-v5/commands/credentials.js
+++ b/packages/pg-v5/commands/credentials.js
@@ -26,11 +26,11 @@ async function run(context, heroku) {
       return util.presentCredentialAttachments(app, credAttachments, credentials, cred)
     }
 
-    credentials = await heroku.get(`/postgres/v0/databases/${addon.name}/credentials`,
+    credentials = await heroku.get(`/postgres/v0/databases/${addon.id}/credentials`,
       {host: host(addon)})
     let isDefaultCredential = cred => cred.name !== 'default'
     credentials = sortBy(credentials, isDefaultCredential, 'name')
-    attachments = await heroku.get(`/addons/${addon.name}/addon-attachments`)
+    attachments = await heroku.get(`/addons/${addon.id}/addon-attachments`)
 
     cli.warn(`${cli.color.cmd('pg:credentials')} has recently changed. Please use ${cli.color.cmd('pg:credentials:url')} for the previous output.`)
     cli.table(credentials, {
diff --git a/packages/pg-v5/test/unit/commands/credentials.unit.test.js b/packages/pg-v5/test/unit/commands/credentials.unit.test.js
index 19786440dc..1943384c81 100644
--- a/packages/pg-v5/test/unit/commands/credentials.unit.test.js
+++ b/packages/pg-v5/test/unit/commands/credentials.unit.test.js
@@ -103,8 +103,8 @@ describe('pg:credentials', () => {
         namespace: 'credential:ransom',
       },
     ]
-    api.get('/addons/postgres-1/addon-attachments').reply(200, attachments)
-    pg.get('/postgres/v0/databases/postgres-1/credentials').reply(200, credentials)
+    api.get('/addons/1/addon-attachments').reply(200, attachments)
+    pg.get('/postgres/v0/databases/1/credentials').reply(200, credentials)
 
     let displayed = `Credential                                                                     State
 ─────────────────────────────────────────────────────────────────────────────  ────────
@@ -179,8 +179,8 @@ ransom                                                                         a
         namespace: 'credential:ransom',
       },
     ]
-    api.get('/addons/postgres-1/addon-attachments').reply(200, attachments)
-    pg.get('/postgres/v0/databases/postgres-1/credentials').reply(200, credentials)
+    api.get('/addons/1/addon-attachments').reply(200, attachments)
+    pg.get('/postgres/v0/databases/1/credentials').reply(200, credentials)
 
     let displayed = `Credential                                            State
 ────────────────────────────────────────────────────  ────────