Improve some naming.