Updated Custom Unit Names
cleaned up code for Custom Unit Names