Wrong db type
Name cleanup