Some feature related renamings