More renaming

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
More renaming, in examples

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>