Using more standardized vocabulary.
Updated docs to use inner joins.