Minor name adjustment
Now using pointers for database_t