Renaming "xx_db" to "xx_database" in configuration