Changed 'unit' variable names.