renamed methods to keep inline wiht common naming schemes
Merge remote-tracking branch 'origin/trunk' into trunk