Clean up and fix some var names for database backups