Check in base class
Fix naming bug