Rename and lint.