Rename, and fix for OXY projection, etc