Change names of t1 and t2 ports and t1 and t2 subnets.

Change-Id: Iaa42f11bc0c3e855723f5b94793327088867e29b