Refactor versions to make more sense to cbeer.