Name fixes
Version bump