remove 'stub' from method names and bring internal descriptions up to date