Some variable name changes.
Merge commit 'ebacf53'

Conflicts:
	Makefile.in