Update TODO
Rename DatabaseConnection to Database
Change DatabaseConnection call to Database