renames, also fix first geo derv