Renamed TypeMap classes to be consistent with ITypeMap interface naming.