fixing the database key names