Monitor random effects. Also - minor renames.