Merge "Revert "Refactor random naming""