Correct naming for Database