Good luck with 2.x version of blivet. Looks good to me but this needs more eyes here. Did you use some script for the renaming? -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/263