Updates for generic SCM variable names etc.

Though I see 6 commits listed here, the changes seem only related to the relevant 2 most recent commits.