variable renamings and tests, @wip on issue #4