more fixes for random variable naming schemes. Also fix parameter names