Fixed problem with default names