More clean up of strings and renaming directory for OctOS

Change-Id: Ib802b677b1160a7b287f6844ab05409cedead1ee