Updated some naming and wording for clarity
Updated some naming and wording for clarity

Former-commit-id: a2f8b2eb2e33567a881f37bd93788d249425898e
djosborne/libcalico,tomdee/libcalico,caseydavenport/libcalico,TrimBiggs/libcalico,tomdee/libnetwork-plugin,robbrockbank/libcalico,TrimBiggs/libnetwork-plugin,insequent/libcalico,projectcalico/libnetwork-plugin,Symmetric/libcalico,projectcalico/libcalico,alexhersh/libcalico,TrimBiggs/libnetwork-plugin,plwhite/libcalico,L-MA/libcalico