Changed naming to standard "Unit" convention. Nothing has been changed to code directly.