fixed terminology bugs