Renamed two java classes to groovy classes.