Properly update schema version
Rename stuff for logging