updating terminology

Updating the terminology in readme and code following #182.