Change the nomenclature

Implements #72.