Fix variable references in UUID generation