Fix names
Merge pull request #155 from soc/patch-1

Fix names