Auto naming fix