Change remaining 'custom_name' to 'name'