Fix Maven source generation to use new package names
Fix test compile errors