XX-11057: Only perform check after replaceShortFieldNames