some adjustments to the C type names