From 0d35a69f0eea191f423ba6b0120ffffcbd6d9ed1 Mon Sep 17 00:00:00 2001
From: Brian Coca <brian.coca+git@gmail.com>
Date: Mon, 4 Dec 2017 10:46:46 -0500
Subject: [PATCH] normalize names

---
 lib/ansible/playbook/base.py             | 2 ++
 lib/ansible/playbook/block.py            | 1 -
 lib/ansible/playbook/play.py             | 1 -
 lib/ansible/playbook/playbook_include.py | 1 -
 lib/ansible/playbook/task.py             | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/ansible/playbook/base.py b/lib/ansible/playbook/base.py
index 26c92157431..878db4820b3 100644
--- a/lib/ansible/playbook/base.py
+++ b/lib/ansible/playbook/base.py
@@ -141,6 +141,8 @@ class BaseMeta(type):
 
 class Base(with_metaclass(BaseMeta, object)):
 
+    _name = FieldAttribute(isa='string', default='', always_post_validate=True, inherit=False)
+
     # connection/transport
     _connection = FieldAttribute(isa='string')
     _port = FieldAttribute(isa='int')
diff --git a/lib/ansible/playbook/block.py b/lib/ansible/playbook/block.py
index 7dc0cf3e987..b34df9f21c3 100644
--- a/lib/ansible/playbook/block.py
+++ b/lib/ansible/playbook/block.py
@@ -39,7 +39,6 @@ class Block(Base, Become, Conditional, Taggable):
     # other fields
     _delegate_to = FieldAttribute(isa='string')
     _delegate_facts = FieldAttribute(isa='bool', default=False)
-    _name = FieldAttribute(isa='string', default='')
 
     # for future consideration? this would be functionally
     # similar to the 'else' clause for exceptions
diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py
index 885b5fc3ea9..e88667480d3 100644
--- a/lib/ansible/playbook/play.py
+++ b/lib/ansible/playbook/play.py
@@ -54,7 +54,6 @@ class Play(Base, Taggable, Become):
     """
 
     # =================================================================================
-    _name = FieldAttribute(isa='string', default='', always_post_validate=True)
     _hosts = FieldAttribute(isa='list', required=True, listof=string_types, always_post_validate=True)
 
     # Facts
diff --git a/lib/ansible/playbook/playbook_include.py b/lib/ansible/playbook/playbook_include.py
index 1107ac83c22..54ca63f36fc 100644
--- a/lib/ansible/playbook/playbook_include.py
+++ b/lib/ansible/playbook/playbook_include.py
@@ -34,7 +34,6 @@ from ansible.template import Templar
 
 class PlaybookInclude(Base, Conditional, Taggable):
 
-    _name = FieldAttribute(isa='string')
     _import_playbook = FieldAttribute(isa='string')
     _vars = FieldAttribute(isa='dict', default=dict())
 
diff --git a/lib/ansible/playbook/task.py b/lib/ansible/playbook/task.py
index b00c638b32b..a0156e1937d 100644
--- a/lib/ansible/playbook/task.py
+++ b/lib/ansible/playbook/task.py
@@ -77,7 +77,6 @@ class Task(Base, Conditional, Taggable, Become):
     _failed_when = FieldAttribute(isa='list', default=[])
     _loop = FieldAttribute()
     _loop_control = FieldAttribute(isa='class', class_type=LoopControl, inherit=False)
-    _name = FieldAttribute(isa='string', default='')
     _notify = FieldAttribute(isa='list')
     _poll = FieldAttribute(isa='int', default=10)
     _register = FieldAttribute(isa='string')