fix naming errors