Changed name for base class

minor changes to naming