Tweak naming and docs to hopefully be more comprehensible