diff --git a/library/Zend/Application/Resource/Useragent.php b/library/Zend/Application/Resource/UserAgent.php
similarity index 100%
rename from library/Zend/Application/Resource/Useragent.php
rename to library/Zend/Application/Resource/UserAgent.php
diff --git a/library/Zend/Gdata/Analytics/Extension/Goal.php b/library/Zend/Gdata/Analytics/Goal.php
similarity index 100%
rename from library/Zend/Gdata/Analytics/Extension/Goal.php
rename to library/Zend/Gdata/Analytics/Goal.php
diff --git a/library/Zend/Tool/Framework/Provider/DocblockManifestable.php b/library/Zend/Tool/Framework/Provider/DocblockManifestInterface.php
similarity index 100%
rename from library/Zend/Tool/Framework/Provider/DocblockManifestable.php
rename to library/Zend/Tool/Framework/Provider/DocblockManifestInterface.php
diff --git a/library/Zend/Validate/Barcode/Intelligentmail.php b/library/Zend/Validate/Barcode/IntelligentMail.php
similarity index 100%
rename from library/Zend/Validate/Barcode/Intelligentmail.php
rename to library/Zend/Validate/Barcode/IntelligentMail.php
diff --git a/tests/Zend/Application/Resource/UseragentTest.php b/tests/Zend/Application/Resource/UseragentTest.php
index ac909799a5..3f9a08b413 100644
--- a/tests/Zend/Application/Resource/UseragentTest.php
+++ b/tests/Zend/Application/Resource/UseragentTest.php
@@ -28,7 +28,7 @@
  */
 require_once 'Zend/Loader/Autoloader.php';
 require_once 'Zend/Application/Resource/ResourceAbstract.php';
-require_once 'Zend/Application/Resource/Useragent.php';
+require_once 'Zend/Application/Resource/UserAgent.php';
 
 /**
  * @category   Zend