renamed classes, functions, and properties to fit standard namming patterns