fixed naming errors