update keywords more consistent with general usage