fixed database and naming completely