Rename some stuff to try and figure out the db session weirdness.