Hispanic term applied to Portuguese and Brazilians

"...the 16th century Portuguese poet Luís de Camões wrote in one of his works: ...castellanos y portugueses, porque españoles lo somos todos... ("Castilians and Portuguese: for Hispanioles we all are."). The whole peninsula was still referred to as España from the term Hispania"
In my opinion, Portuguese and Brazilians should be included in the Hispanics category, or at least create a Iberian and Ibero-American category.