refactor - reaming of variable naming.