notice fix
Issue #2360995 by joestewart, helmo: Fixed makefile field entries not saved.
Issue #2353887 by helmo, Jon Pugh | Deciphered: Replace Client internal name with machine_name field.