Fix in BASETYPE regexes to match on word boundaries