Fixed some naming.