Fix incorrect names