Cleanup: Rename "intermediary" --> "intermediate"

net/data/verify_certificate_chain_unittest/generate-expired-target-notBefore.py

 #!/usr/bin/python
 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Certificate chain with 1 intermediary, where the target is expired (violates
+"""Certificate chain with 1 intermediate, where the target is expired (violates
 validity.notBefore). Verification is expected to fail."""
 
 import common
 
 # Self-signed root certificate (part of trust store).
 root = common.create_self_signed_root_certificate('Root')
 root.set_validity_range(common.JANUARY_1_2015_UTC, common.JANUARY_1_2016_UTC)
 
-# Intermediary certificate.
-intermediary = common.create_intermediary_certificate('Intermediary', root)
-intermediary.set_validity_range(common.JANUARY_1_2015_UTC,
+# Intermediate certificate.
+intermediate = common.create_intermediate_certificate('Intermediate', root)
+intermediate.set_validity_range(common.JANUARY_1_2015_UTC,
                                 common.JANUARY_1_2016_UTC)
 
 # Target certificate.
-target = common.create_end_entity_certificate('Target', intermediary)
+target = common.create_end_entity_certificate('Target', intermediate)
 target.set_validity_range(common.MARCH_2_2015_UTC, common.JANUARY_1_2016_UTC)
 
-chain = [target, intermediary]
+chain = [target, intermediate]
 trusted = [root]
 
-# Both the root and intermediary are valid at this time, however the
+# Both the root and intermediate are valid at this time, however the
 # target is not.
 time = common.MARCH_1_2015_UTC
 verify_result = False
 
 common.write_test_file(__doc__, chain, trusted, time, verify_result)