WIP: Resolve "adapt example uri to new convention"

Closed Maria Poveda requested to merge 5-adapt-example-uri-to-new-convention into master