[Generator] Clean-up, added missing file; a generated name can now contain a middle letter