changed class names to reflect sub-objects and extenstions with the number of -