Improve instance name