OASIS: Keep the same names if possible