re #547 - Update all scripts, remove v2_ prefix from databases
re #547 - Fix typo