Rename and rationalise methods as per discussion on GitHub
Merge branch 'bulk-refactor' into master