US44- Refactoring Code

I fixed names and follow the PEPS for Solver package