Use correct variable names

Resolves #22