Lee surrendered to Grant at Appomattox Court House, effectively ending the "War Between the States," aka the "Civil War," aka the "War of Yankee Aggression."
Posted from Rivals Mobile
Official U.S. records call it the "War of the Rebellion," which makes sense, as it was a rebellion, and ends the somewhat nonsensical argument over naming based mostly on whether it was one nation or two doing the fighting.
But, as we are one nation, and as Lincoln said, "If we are not one nation, why do we fight them," "Civil War" works for me, especially if it annoys particularly recalcitrant Southerners.