renamings and cosmetics on OSC examples