fixed the naming errors