Refactor file names
Update client forms