Changed name handling.