Upgrading version and changing version naming conventions