Work in progress renaming variables after PR#24 merge.