diff --git a/examples/index-i18n.html b/examples/index-i18n.html
index ed02775..0bea514 100644
--- a/examples/index-i18n.html
+++ b/examples/index-i18n.html
@@ -24,7 +24,7 @@
 				var i18n = $.i18n( );
 				$( '.uls-trigger' ).uls( {
 					onSelect : function( language ) {
-						var languageName = $.uls.data.autonym( language );
+						var languageName = $.uls.data.getAutonym( language );
 						$('a#pageLanguage').text( languageName );
 						i18n.locale = language;
 						// For ULS
diff --git a/examples/index.html b/examples/index.html
index e3417ae..213588e 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -32,7 +32,7 @@
 			$( document ).ready( function() {
 				$( '.uls-trigger' ).uls( {
 					onSelect : function( language ) {
-						var languageName = $.uls.data.autonym( language );
+						var languageName = $.uls.data.getAutonym( language );
 						$('a#pageLanguage').text( languageName );
 					},
 					quickList: ['en', 'hi', 'he', 'ml', 'ta','fr'] //FIXME
diff --git a/src/jquery.uls.data.utils.js b/src/jquery.uls.data.utils.js
index 95766f5..3e9263f 100644
--- a/src/jquery.uls.data.utils.js
+++ b/src/jquery.uls.data.utils.js
@@ -79,7 +79,7 @@
 		var autonymsByCode = {};
 
 		for ( var language in $.uls.data.languages ) {
-			autonymsByCode[language] = $.uls.data.autonym( language );
+			autonymsByCode[language] = $.uls.data.getAutonym( language );
 		}
 
 		return autonymsByCode;
@@ -429,8 +429,8 @@
 	 * @param two language codes
 	 */
 	$.uls.data.sortByAutonym = function( a, b ) {
-		var autonymA = $.uls.data.autonym( a ) || a,
-			autonymB = $.uls.data.autonym( b ) || b;
+		var autonymA = $.uls.data.getAutonym( a ) || a,
+			autonymB = $.uls.data.getAutonym( b ) || b;
 		return ( autonymA.toLowerCase() < autonymB.toLowerCase() ) ? -1 : 1;
 	};
 
diff --git a/src/jquery.uls.languagefilter.js b/src/jquery.uls.languagefilter.js
index 3acfe15..9c1d4d3 100644
--- a/src/jquery.uls.languagefilter.js
+++ b/src/jquery.uls.languagefilter.js
@@ -208,7 +208,7 @@
 				suggestion = userInput + languageName.substring( userInput.length, languageName.length );
 			if ( suggestion.toLowerCase() !== languageName.toLowerCase() ) {
 				// see if it was autonym match
-				autonym = $.uls.data.autonym( langCode ) || '';
+				autonym = $.uls.data.getAutonym( langCode ) || '';
 				suggestion = userInput + autonym.substring( userInput.length, autonym.length );
 				if ( suggestion !== autonym ) {
 					// Give up. It may be iso/script code match.
@@ -247,7 +247,7 @@
 			var matcher = new RegExp( "^" + this.escapeRegex( searchTerm ), 'i' ),
 				languageName = this.options.languages[langCode];
 			return matcher.test( languageName ) ||
-				matcher.test( $.uls.data.autonym( langCode ) ) ||
+				matcher.test( $.uls.data.getAutonym( langCode ) ) ||
 				matcher.test( langCode ) ||
 				matcher.test( $.uls.data.getScript( langCode ) );
 		}
diff --git a/src/jquery.uls.lcd.js b/src/jquery.uls.lcd.js
index 1fbcd26..b22aa65 100644
--- a/src/jquery.uls.lcd.js
+++ b/src/jquery.uls.lcd.js
@@ -74,7 +74,7 @@
 		addToRegion: function( langCode, region ) {
 			var that = this;
 			var language = that.options.languages[langCode],
-				langName = $.uls.data.autonym( langCode ) || language || langCode,
+				langName = $.uls.data.getAutonym( langCode ) || language || langCode,
 				regions = [];
 
 			if ( region ) {
@@ -206,7 +206,7 @@
 				var $column = this.getColumn( 'quick', i % 4 === 0 );
 				var langCode = quickList[i];
 				var language = this.options.languages[langCode];
-				var langName = $.uls.data.autonym( langCode ) || language || langCode;
+				var langName = $.uls.data.getAutonym( langCode ) || language || langCode;
 				var $li = $( '<li>' )
 					.data( 'code', langCode )
 					.attr( {