Update with .Net naming convention standards.