Other fix for name incoherency