MAINT: Object rename and doc change