diff --git a/server_manager/web_app/app.ts b/server_manager/web_app/app.ts
index 6d3abb23de..3ea96c68c4 100644
--- a/server_manager/web_app/app.ts
+++ b/server_manager/web_app/app.ts
@@ -30,6 +30,7 @@ import * as digitalocean from '../model/digitalocean';
 import * as gcp from '../model/gcp';
 import type {CloudLocation} from '../model/location';
 import * as server_model from '../model/server';
+import { FeedbackDetail } from './ui_components/outline-feedback-dialog';
 
 
 // The Outline DigitalOcean team's referral code:
diff --git a/server_manager/web_app/gallery_app/main.ts b/server_manager/web_app/gallery_app/main.ts
index 28ac6c2533..a7375b27f6 100644
--- a/server_manager/web_app/gallery_app/main.ts
+++ b/server_manager/web_app/gallery_app/main.ts
@@ -13,15 +13,15 @@
 // limitations under the License.
 
 import '../ui_components/outline-about-dialog';
-import '../ui_components/outline-contact-dialog';
+import '../ui_components/outline-contact-us-dialog';
 import '../ui_components/outline-do-oauth-step';
 import '../ui_components/outline-gcp-oauth-step';
-import '../ui_components/outline-gcp-create-server-app';
 import '../ui_components/outline-server-view';
 import '../ui_components/outline-share-dialog';
 import '../ui_components/outline-sort-span';
 import '../ui_components/outline-survey-dialog';
 import '../ui_components/outline-per-key-data-limit-dialog';
+import '../outline-gcp-create-server-app';
 import '@polymer/paper-checkbox/paper-checkbox';
 import '@polymer/paper-dialog/paper-dialog';
 
@@ -259,16 +259,12 @@ export class TestApp extends LitElement {
       </div>
 
       <div class="widget">
-        <h2>outline-contact-view</h2>
-        <button @tap=${() => this.select('#contactDialog').open()}>
+        <h2>outline-contact-us-dialog</h2>
+        <button @tap=${() => this.select('outline-contact-us-dialog').open()}>
           Open Dialog
         </button>
-        <paper-dialog id="contactDialog" modal="">
-          <outline-contact-view
-            .localize=${this.localize}
-            dir=${this.dir}
-          ></outline-contact-view>
-      </paper-dialog>
+        <outline-contact-us-dialog .localize=${this.localize} dir=${this.dir}
+        ></outline-contact-us-dialog>
       </div>
 
       <div class="widget">
diff --git a/server_manager/web_app/ui_components/app-root.ts b/server_manager/web_app/ui_components/app-root.ts
index b2c44c2d3f..f18ca03029 100644
--- a/server_manager/web_app/ui_components/app-root.ts
+++ b/server_manager/web_app/ui_components/app-root.ts
@@ -479,7 +479,7 @@ export class AppRoot extends polymerElementWithLocalize {
           localize="[[localize]]"
           on-success="showContactSuccessToast"
           on-error="showContactErrorToast"
-        ></outline-contact-view>
+        ></outline-contact-us-dialog>
       </template>
       <template is="dom-if" if="{{!contactViewFeatureFlag}}">
         <outline-feedback-dialog id="feedbackDialog" localize="[[localize]]"></outline-feedback-dialog>