Fix incorrect version and naming issues.