Add connection error notification, change file names