Renamed HsqldbDataSourceProvider to DataSourceProvider