Changed naming convention to avoid shadowing (issue #25)