Lint and renaming