lint and renames from tmc