diff --git a/app/elements/buddy-finder/user-avatar.html b/app/elements/buddy-finder/buddy-avatar.html
similarity index 98%
rename from app/elements/buddy-finder/user-avatar.html
rename to app/elements/buddy-finder/buddy-avatar.html
index ee813b5..ec4ab6e 100644
--- a/app/elements/buddy-finder/user-avatar.html
+++ b/app/elements/buddy-finder/buddy-avatar.html
@@ -1,5 +1,5 @@
 <link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
-<dom-module id="user-avatar">
+<dom-module id="buddy-avatar">
     <template>
         <style>
         :host {
@@ -55,7 +55,7 @@
     <script>
     'use strict';
     Polymer({
-        is: 'user-avatar',
+        is: 'buddy-avatar',
         properties: {
             contact: Object,
             _displayName: {
diff --git a/app/elements/buddy-finder/buddy-finder.html b/app/elements/buddy-finder/buddy-finder.html
index 02c0251..cc3f903 100644
--- a/app/elements/buddy-finder/buddy-finder.html
+++ b/app/elements/buddy-finder/buddy-finder.html
@@ -1,7 +1,7 @@
 <link rel="import" href="../../bower_components/iron-ajax/iron-ajax.html">
 <link rel="import" href="../../bower_components/paper-styles/paper-styles.html">
 <link rel="import" href="../file-sharing/file-input.html">
-<link rel="import" href="user-avatar.html">
+<link rel="import" href="buddy-avatar.html">
 <link rel="import" href="personal-avatar.html">
 <dom-module id="buddy-finder">
     <template>
@@ -64,7 +64,7 @@
         <div class="buddies">
             <template is="dom-repeat" items="{{buddies}}">
                 <file-input on-file-selected="_fileSelected" only$="{{!buddies.1}}">
-                    <user-avatar contact="{{item}}" class="buddy"></user-avatar>
+                    <buddy-avatar contact="{{item}}" class="buddy"></buddy-avatar>
                 </file-input>
             </template>
         </div>