Merge "Update some docs & tweak some method names"