We need to make sure we override existing database_name name methods, so they were moved to the patch file