More database.php rename failures, it's good now! #database