Made object renames in issue #24 but skipped renaming the variable names used. This need to be renamed later. This issue can therefore be moved to milestone 1.0.0.M2 since it is an refactoring issue now.
Fixed #31