Conflicts: libraries/database_interface.lib.php
This only makes it harder to type it new name (RFE #1429).