Rename files to lower chance of duplication

Continue doc
Start test