Fix names and change upload behaviour in ostf

Change-Id: I050c766e4ebe1ebf5ae7eed2387af168a239c3c7
Merge "Fix names and change upload behaviour in ostf"