Change type name and adpat doc and tests