Unified versions
Better version naming and numbering