Issue #59 renaming variable names etc