Minor changes in default names