Fixing some default names