Make naming consistent with .NET and Android