Rename, definitions removed