scripting nomenclature changes

- closes #1780 
- closes #1808