Renamed some memebers __*__ -> OPT__\1
Revert "avoid empty procedures - keep Top-namespace clean (a start)" in order to keep stable interface

This reverts commit ba19a8a94da4931a7c4fb8ea6bc91256251c15ec.
+ minor changes : no export to Top