Fixed: the generators to match the new convention
Merge pull request #3 from jsilvestre/fix/generators

Fixed: the generators to match the new convention