Improved auto-name feature to change on model change

Will not change name if user types value into name box