Multiple fixes

Improved the way duplicated schemas' names are managed on export;
merge
Added main missing entry