Small updates to naming of components.