Change Name property for TypeId - Update #25