first step towards removing the word database
more removal of the word 'database'
Merge branch 'feature/database_deprecations' into development