Standardize names for external includes