Reanme the machines to remove unwanted _ in name

Signed-off-by: Khem Raj <raj.khem@gmail.com>