more dotNet naming guidelines fixes