Minor changes to naming.