Fix some additional names.