Revert display_name till c++ autogen issues are resolved