Rename 2 methods
Rename 2 methods
Merge branch 'master' into dev_lwk3

Conflicts:
	bulk/StreamEvent.cpp
Fix previous commits