Fix environment / :database config namespacing to be consistent