Minor documentation/naming updates