Fix some external names to match KA naming conventions.