Silverlight: More naming fixes.