Instance name better handling