Made portable mode compatible with naming scheme used by .NET implementation