[cvs-nhc98] patch applied (yhc): Change from using Play2 to using Uniplate, fixing up all the names to the final versions