Minor file renaming to try to simplify things