Fix 'renamed lint' warnings