Small tweaks to var/method names