Use capital case for array name and map name
Fix array name and map name