Changing references to other conventions to ExternalIds from Strings and replacing Periods with Tenors