More versioning and name changing n such