Improve random generation.
Use new namespace constant.