Clean up terminology inside of spark-env script