More apt naming.
Minor language tweaks.