Fix comments + naming.