renamed variables to work around rascal scoping bug