Fix naming errors