Rename some vars in axiom and neethi tests for consistency
2 files changed