Replaced more template references with mankind