clean nameing in DB init a bit