diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index 0006810172..dbab032b97 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -60,7 +60,7 @@
 			if (typeof(this.data('user')) !== 'undefined') {
 				user = this.data('user');
 			} else {
-				this.placeholder('x');
+				this.imageplaceholder('x');
 				return;
 			}
 		}
@@ -76,9 +76,9 @@
 				if (typeof(result) === 'object') {
 					if (!hidedefault) {
 						if (result.data && result.data.displayname) {
-							$div.placeholder(user, result.data.displayname);
+							$div.imageplaceholder(user, result.data.displayname);
 						} else {
-							$div.placeholder(user);
+							$div.imageplaceholder(user);
 						}
 					} else {
 						$div.hide();
diff --git a/core/js/placeholder.js b/core/js/placeholder.js
index ee2a8ce84c..47cff780d2 100644
--- a/core/js/placeholder.js
+++ b/core/js/placeholder.js
@@ -30,7 +30,7 @@
  *
  * And call this from Javascript:
  *
- * $('#albumart').placeholder('The Album Title');
+ * $('#albumart').imageplaceholder('The Album Title');
  *
  * Which will result in:
  *
@@ -38,7 +38,7 @@
  *
  * You may also call it like this, to have a different background, than the seed:
  *
- * $('#albumart').placeholder('The Album Title', 'Album Title');
+ * $('#albumart').imageplaceholder('The Album Title', 'Album Title');
  *
  * Resulting in:
  *
@@ -47,7 +47,7 @@
  */
 
 (function ($) {
-	$.fn.placeholder = function(seed, text) {
+	$.fn.imageplaceholder = function(seed, text) {
 		// set optional argument "text" to value of "seed" if undefined
 		text = text || seed;