Switch to using new database_name attribute