Now uses a namespace corresponding to the database connection type.