Improved naming algorithm and added boolean options to dialog