Minor name revisions

revised some names for clarity and ambiguity with .NET naming.