Improvements for Random and name refactoring to 
avoid confusion