Minor re-factoring of variable names in groovlet