rename some routines
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/common/common.h