Fix some templates, replace using maven_group with java_package where appropriate