Slice some more the code into logical namespace separation. The code
generated is like before!!!