Update for Custom Unit Names and Stargate Unit Names