HLA-18: changed group id and package names