Changed terminology

Manual merge of #3