Changed dataSource.getDataSourceName to getName