Rename for consistency?