No, sorry but you are not correct. Hispania comprises the two individual Countries Portugal and Spain, Hispaniola is made up of The Dominican Republic and Haiti.
Hispanic is derived from the conquest of Spaniards and Italians and their prodigy.
My family, a royal one, is from Spain. I am not Hispanic.
Spanish yes, the politically correct Hispanic, no.
Sorry, my friend. Hispanus and hispanicus were in use before there were Spaniards, let alone before they conquered anyone. Both terms designated those who came from Hispania, which as I said, is primarily modern day Spain. Hispania referred to the entire Iberian Peninsula, but Spain was conquered by Rome, and it’s denizens thus carried the name prior.