Terminology: ‘Tan War’ or ‘War of Independence’?

So is the ‘Tan War’ or ‘War of Independence’ the preferred term to describe the period from 1919 to the truce in 1921? Next year will be the centenary of the Easter Rising of 1916, which was known at the time as the ‘Sinn Féin Rebellion’ and other variants of ‘Rebellion’ (‘Easter’ or ‘Irish’ or just