Fixed naming errors