Renamed library interface
Renamed database interface
Refactored interfaces