Removed etbd naming conventions from names to keep it generic
Merge pull request #2 from ETBD/fixes_for_reuseing_of_public_url

Removing ETBD references from naming conventions