Merge pull request #168 from xen/master

Merge branch 'renaming'
Merge pull request #169 from xen/renaming

Merge pull request #168 from xen/master