Update Java templates with new names and packages

Change-Id: Ic196817e94acafddddbc6ce577f6e3042826a2ae