Ensure that automatically generated layer names and ids don't cause conflicts
Merge pull request #1837 from Ryanl92/layer-autonaming

Ensure that automatically generated layer names and ids don't cause conf...