More renamings and cleaning