diff --git a/lime/app/Preloader.hx b/lime/app/Preloader.hx
index f1bedd6af..6643479d3 100644
--- a/lime/app/Preloader.hx
+++ b/lime/app/Preloader.hx
@@ -153,7 +153,7 @@ class Preloader #if flash extends Sprite #end {
 		
 		for (paths in soundPaths) {
 			
-			AudioBuffer.loadFiles (paths).onComplete (function (audioBuffer) {
+			AudioBuffer.loadFromFiles (paths).onComplete (function (audioBuffer) {
 				
 				for (path in paths) {
 					
diff --git a/lime/audio/AudioBuffer.hx b/lime/audio/AudioBuffer.hx
index cae58c20b..ba990041b 100644
--- a/lime/audio/AudioBuffer.hx
+++ b/lime/audio/AudioBuffer.hx
@@ -273,7 +273,7 @@ class AudioBuffer {
 	}
 	
 	
-	public static function loadFile (path:String):lime.app.Future<AudioBuffer> {
+	public static function loadFromFile (path:String):Future<AudioBuffer> {
 		
 		var promise = new Promise<AudioBuffer> ();
 		
@@ -342,7 +342,7 @@ class AudioBuffer {
 	}
 	
 	
-	public static function loadFiles (paths:Array<String>):Future<AudioBuffer> {
+	public static function loadFromFiles (paths:Array<String>):Future<AudioBuffer> {
 		
 		var promise = new Promise<AudioBuffer> ();
 		
diff --git a/templates/haxe/DefaultAssetLibrary.hx b/templates/haxe/DefaultAssetLibrary.hx
index dbfd491fa..695296b43 100644
--- a/templates/haxe/DefaultAssetLibrary.hx
+++ b/templates/haxe/DefaultAssetLibrary.hx
@@ -478,7 +478,7 @@ class DefaultAssetLibrary extends AssetLibrary {
 			
 		} else if (path.exists (id)) {
 			
-			promise.completeWith (AudioBuffer.loadFile (path.get (id)));
+			promise.completeWith (AudioBuffer.loadFromFile (path.get (id)));
 			
 		} else {