Altered some naming conventions.
Updated naming conventions.