Removed etbd naming conventions from names to keep it generic