formatting, unique-ify name for databases
Merge branch 'hotfix/1.1.2'