Updated custom unit names for gamma compatibility