Renamed classes, fields, locals, properties etc. to fit more general
naming conventions.