Updating for vocabulary machine names and various variable conversions.