Fixing namespace for GeneratorBuilder, more moves for Params