[blivet f20/master 4/5] Fix usage of _ vs N_