Change lint names for upstream