Don't include version in name, revert 5a819c9