some naming, version changes