Fix idiotic name support (with identified_by: ep)