Directory renaming for OctOS

Change-Id: I28b94bfa5178f31a5e364f0fa8781b882a3ee0d6