RNG: minor refactoring of macro and file names