Renamings, syntax fix