diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php
index c99f7b4f4db4fd8809e70593fe09a384a81df955..4534307b1192843b8bd3ba62b388a8829309066b 100644
--- a/plugins/MobileMessaging/SMSProvider.php
+++ b/plugins/MobileMessaging/SMSProvider.php
@@ -47,8 +47,7 @@ abstract class Piwik_MobileMessaging_SMSProvider
 	 */
 	static public function factory($providerName)
 	{
-		$name = ucfirst(strtolower($providerName));
-		$className = 'Piwik_MobileMessaging_SMSProvider_' . $name;
+		$className = 'Piwik_MobileMessaging_SMSProvider_' . $providerName;
 
 		try {
 			Piwik_Loader::loadClass($className);
@@ -57,7 +56,7 @@ abstract class Piwik_MobileMessaging_SMSProvider
 			throw new Exception(
 				Piwik_TranslateException(
 					'MobileMessaging_Exception_UnknownProvider',
-					array($name, implode(', ', array_keys(self::$availableSMSProviders)))
+					array($providerName, implode(', ', array_keys(self::$availableSMSProviders)))
 				)
 			);
 		}
diff --git a/tests/PHPUnit/Integration/NonUnicodeTests.php b/tests/PHPUnit/Integration/NonUnicodeTest.php
similarity index 98%
rename from tests/PHPUnit/Integration/NonUnicodeTests.php
rename to tests/PHPUnit/Integration/NonUnicodeTest.php
index 17374b6c4d820e6deb939fcacc9c091bc8cec99c..40252c1fae7c878eb912761879a09f21ca0cff72 100755
--- a/tests/PHPUnit/Integration/NonUnicodeTests.php
+++ b/tests/PHPUnit/Integration/NonUnicodeTest.php
@@ -11,7 +11,7 @@
  * Tests that visits track & reports display correctly when non-unicode text is
  * used in URL query params of visits.
  */
-class Test_Piwik_Integration_NonUnicodeTests extends IntegrationTestCase
+class Test_Piwik_Integration_NonUnicodeTest extends IntegrationTestCase
 {
 	protected static $idSite1 = 1;
 	protected static $dateTime = '2010-01-03 11:22:33';