Fix comments from rename; update comments