Adding machine name handling for panels content