Changed naming convention for base class