WIP Updated the samples code regarding the new prefixed form of the API.

What's left for the samples is the associated documentation, and maybe the tests.