In 1954 , it was merged again into Naha .
In 1896 , Shuri was made a ward of the new prefectural capital , Naha , though it was made a separate city again in 1921 .
In 1954 , Shuri was merged again into Naha .
In 1896 , Shuri was made a ward of the new prefectural capital , Naha , though it was made a separate city again in 1921 .