Rename to proper object