method names prefix fixes
Merge pull request #386 from akhileshdarjee/4.0.0-cleanup

method names prefix fixes