Tidy up naming.