some name fixes