Correct scope of units to match naming conventions.