Name change + cleaner closing