Better name handling, safer file deletion