diff --git a/_register_database.php b/_register_database.php
index 8cfebec90..84828103c 100644
--- a/_register_database.php
+++ b/_register_database.php
@@ -32,11 +32,11 @@ DatabaseAdapterRegistry::register(
 
 DatabaseAdapterRegistry::register(
 	array(
-		'class' => 'SQLite3Database',
+		'class' => 'SQLiteDatabase',
 		'title' => 'SQLite 3.3+',
 		'helperPath' => 'sqlite3/code/SQLiteDatabaseConfigurationHelper.php',
 		'supported' => (class_exists('SQLite3') || class_exists('PDO')),
-		'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a> and <a href="http://php.net/manual/en/book.pdo.php">PDO</a> classes are not available. Please install or enable them and refresh this page.',
+		'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a> and <a href="http://php.net/manual/en/book.pdo.php">PDO</a> classes are not available. Please install or enable one of them and refresh this page.',
 		'fields' => array(
 			'path' => array(
 				'title' => 'Database path<br /><small>Absolute path, writeable by the webserver user.<br />Recommended to be outside of your webroot</small>',
diff --git a/dev/install/config-form.html b/dev/install/config-form.html
index e8a8ac7be..d1b269daf 100644
--- a/dev/install/config-form.html
+++ b/dev/install/config-form.html
@@ -159,7 +159,7 @@
 													
 													// html
 													echo "<div class=\"field\">";
-													echo "<label for=\"db_$class_$fieldName\">$fieldTitle:</label>";
+													echo "<label for=\"db_{$class}_$fieldName\">$fieldTitle:</label>";
 													echo "<span class=\"middleColumn\">";
 													echo "<input $attrHTML>";
 													echo "</span>";