Updated some naming conventions.