Examples cleanup
Changed ambiguous naming