Change casing & struct type