Fix a bad malloc, be consistent with static names