Fixed hyphens in var names