Changed namespace for generation