better file naming system -- removes double underscore