Fixed namespace things with constant generation.
3 files changed