Changed some vocabulary