Remove bug in name management.