Simplify names.
Merge branch 'previewscript' into staging

* previewscript:
  Simplify names.