Take out versions in names where we don't need them