DB name cleanup, in particular with schema names