Issue #2312271 by rodrigoaguilera: Save machine names instead of vids in the vocabulary options array