Changed the wording to GeoViQua compatible words