dave/tim renaming ednvar params as suggested