Include database bump in upgrade script
Rename upgrade script