Shorten names, add More Versions