(CNN) President Donald Trump has signed a bill naming a post office for Capt. Humayun Khan, the slain soldier whose family Trump feuded with during the 2016 presidential campaign.

The law dubs a US Postal Service facility in Charlottesville, Virginia, the Captain Humayun Khan Post Office. It follows an extended controversy from the summer before Trump's victory.

Khizr Khan, the late captain's father, delivered a fiery speech at the 2016 Democratic National Convention alongside his wife, criticizing the then-Republican nominee for president. At the time, Trump responded forcefully to the Gold Star family, suggesting wrongly that his wife, Ghazala Khan, might not have been "allowed" to speak and pushing back on Khizr Khan's assertions about the candidate.

In a statement, however, Trump maintained that Khan was "a hero to our country."

ARLINGTON, VA - AUGUST 01: The gravesite of Muslim-American, U.S. Army Capt. Humayun Khan is shown at Arlington National Cemetary August 1, 2016 in in Arlington, Virginia. Khan was killed during Operation Iraqi Freedom in 2004. (Photo by Mark Wilson/Getty Images)

The bill Trump signed into law Friday, more than two years removed from the controversy, was introduced by retiring Rep. Tom Garrett, a Virginia Republican. It passed both chambers of Congress by unanimous consent.

Read More