Same as before: Rename to avoid confusion