Fix slave names

Also fix using wrong variable in define OS system for CDH

Change-Id: Id2a342adccef22d7b922371139c5b9baea73c499