Changed names to make them less ambiguous
Merge pull request #650 from psav/name_changes

Changed names to make them less ambiguous