Changed a few basic terms for comparison

Seems to provide good results!