Fixed.
Updated naming conventions.