Change file names. Prepare for further changes in the refactor.