Database & model namefix