Fixed a critical bug and changed def. name popup