Retern "relation" for "scope" and namespace the real work
kill extra whitespace
Merge branch 'master' into reterm_for_scopes