If you only consider the OT Canon (seeing as the prequel trilogy is...the prequel trilogy, and how EU Canon is always trumped by the movie Canon, and how the new trilogy is basically JJ fanfiction) then the naming system holds true.