code cleanup

new naming conventions
Scopus2Net: Added options

+ force atlas 2 fix