Adding names for remaining types.