Names changed and everything separated working ok