Updated general and .NET naming.

[skip ci]