fixed more naming errors