better database name generation; better support for importing old d6 sites