Rename cards
Encoding fix
Restructure