fixed some default names