Fix warnings about renamed lints