Fixed naming errors.