fixed typedef names to CapCase