Fixed a using error and a naming error, full-fill StyleCop rules

Ok second try, i hope it just show the diff i made after first pull request...