Updated certain references for more consistent naming.