Fix terms conistency