Clean up internal field names, and use Name() instead of ActionName()