Renamed database to databaseHandler in preparation for refactor

Renamed database to databaseHandler in preparation for refactor