Use more conventional names.