diff --git a/src/ol/format/getfeatureinfoformat.js b/src/ol/format/wmsgetfeatureinfoformat.js
similarity index 98%
rename from src/ol/format/getfeatureinfoformat.js
rename to src/ol/format/wmsgetfeatureinfoformat.js
index d8a726cf94..916ae7790c 100644
--- a/src/ol/format/getfeatureinfoformat.js
+++ b/src/ol/format/wmsgetfeatureinfoformat.js
@@ -1,4 +1,4 @@
-goog.provide('ol.format.GetFeatureInfo');
+goog.provide('ol.format.WMSGetFeatureInfo');
 
 goog.require('goog.array');
 goog.require('goog.asserts');
diff --git a/test/spec/ol/format/getfeatureinfoformat.test.js b/test/spec/ol/format/wmsgetfeatureinfoformat.test.js
similarity index 98%
rename from test/spec/ol/format/getfeatureinfoformat.test.js
rename to test/spec/ol/format/wmsgetfeatureinfoformat.test.js
index 1b9acd2333..d402d37161 100644
--- a/test/spec/ol/format/getfeatureinfoformat.test.js
+++ b/test/spec/ol/format/wmsgetfeatureinfoformat.test.js
@@ -1,6 +1,6 @@
-goog.provide('ol.test.format.GetFeatureInfo');
+goog.provide('ol.test.format.WMSGetFeatureInfo');
 
-describe('ol.format.GetFeatureInfo', function() {
+describe('ol.format.WMSGetFeatureInfo', function() {
 
   describe('#readFormat', function() {
 
@@ -200,4 +200,4 @@ describe('ol.format.GetFeatureInfo', function() {
 
 
 goog.require('goog.dom');
-goog.require('ol.format.GetFeatureInfo');
+goog.require('ol.format.WMSGetFeatureInfo');