Code review PR

`database` might be a more familiar term than `dbSchema`.