Fixed model generator
Typo
Normalize namespace
Typo
Merge remote-tracking branch 'origin/master'