Fixed field names and variable declarations to comply with StyleCop Rules