Rename and document some structures to improve consistency