Rename
Fix filenames
Merge branch 'master' into yeoman