Fixed naming consistency & init file paths.
Merge pull request #54 from adioso/master

Fixed naming consistency & init file paths.