Update for Play 2.2
clean up naming