Fix name expand