Use 'version-name' commands instead of sed hack