Rename database class with a better name