fixed even more naming errors