I agree with dawgfoto. Keeping to the .h file's names and such makes things far, far easier to maintain. We should not be inventing or fixing here - just translation.