diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/AUTHORS b/openair-cn/OPENAIRHSS_/OPENAIRHSS/AUTHORS
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/AUTHORS
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/AUTHORS
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/COPYING b/openair-cn/OPENAIRHSS_/OPENAIRHSS/COPYING
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/COPYING
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/COPYING
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/ChangeLog b/openair-cn/OPENAIRHSS_/OPENAIRHSS/ChangeLog
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/ChangeLog
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/ChangeLog
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/INSTALL b/openair-cn/OPENAIRHSS_/OPENAIRHSS/INSTALL
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/INSTALL
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/INSTALL
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/Makefile.am b/openair-cn/OPENAIRHSS_/OPENAIRHSS/Makefile.am
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/Makefile.am
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/Makefile.am
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/NEWS b/openair-cn/OPENAIRHSS_/OPENAIRHSS/NEWS
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/NEWS
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/NEWS
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/README b/openair-cn/OPENAIRHSS_/OPENAIRHSS/README
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/README
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/README
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/access_restriction/Makefile.am b/openair-cn/OPENAIRHSS_/OPENAIRHSS/access_restriction/Makefile.am
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/access_restriction/Makefile.am
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/access_restriction/Makefile.am
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/access_restriction/access_restriction.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/access_restriction/access_restriction.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/access_restriction/access_restriction.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/access_restriction/access_restriction.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/access_restriction/access_restriction.h b/openair-cn/OPENAIRHSS_/OPENAIRHSS/access_restriction/access_restriction.h
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/access_restriction/access_restriction.h
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/access_restriction/access_restriction.h
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/auc/Makefile.am b/openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/Makefile.am
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/auc/Makefile.am
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/Makefile.am
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/auc/auc.h b/openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/auc.h
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/auc/auc.h
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/auc.h
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/auc/fx.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/fx.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/auc/fx.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/fx.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/auc/kdf.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/kdf.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/auc/kdf.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/kdf.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/auc/random.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/random.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/auc/random.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/random.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/auc/rijndael.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/rijndael.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/auc/rijndael.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/rijndael.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/auc/sequence_number.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/sequence_number.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/auc/sequence_number.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/auc/sequence_number.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/autogen.sh b/openair-cn/OPENAIRHSS_/OPENAIRHSS/autogen.sh
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/autogen.sh
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/autogen.sh
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/conf/hss.conf b/openair-cn/OPENAIRHSS_/OPENAIRHSS/conf/hss.conf
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/conf/hss.conf
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/conf/hss.conf
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/conf/hss.conf.in b/openair-cn/OPENAIRHSS_/OPENAIRHSS/conf/hss.conf.in
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/conf/hss.conf.in
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/conf/hss.conf.in
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/conf/hss_fd.conf b/openair-cn/OPENAIRHSS_/OPENAIRHSS/conf/hss_fd.conf
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/conf/hss_fd.conf
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/conf/hss_fd.conf
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/conf/make_certs.sh b/openair-cn/OPENAIRHSS_/OPENAIRHSS/conf/make_certs.sh
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/conf/make_certs.sh
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/conf/make_certs.sh
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/configure.ac b/openair-cn/OPENAIRHSS_/OPENAIRHSS/configure.ac
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/configure.ac
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/configure.ac
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/db/Makefile.am b/openair-cn/OPENAIRHSS_/OPENAIRHSS/db/Makefile.am
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/db/Makefile.am
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/db/Makefile.am
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/db/db_connector.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/db/db_connector.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/db/db_connector.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/db/db_connector.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/db/db_epc_equipment.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/db/db_epc_equipment.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/db/db_epc_equipment.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/db/db_epc_equipment.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/db/db_proto.h b/openair-cn/OPENAIRHSS_/OPENAIRHSS/db/db_proto.h
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/db/db_proto.h
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/db/db_proto.h
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/db/db_subscription_data.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/db/db_subscription_data.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/db/db_subscription_data.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/db/db_subscription_data.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/db/oai_db.sql b/openair-cn/OPENAIRHSS_/OPENAIRHSS/db/oai_db.sql
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/db/oai_db.sql
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/db/oai_db.sql
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/debian/changelog b/openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/changelog
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/debian/changelog
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/changelog
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/debian/compat b/openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/compat
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/debian/compat
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/compat
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/debian/control b/openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/control
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/debian/control
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/control
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/debian/copyright b/openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/copyright
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/debian/copyright
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/copyright
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/debian/dirs b/openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/dirs
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/debian/dirs
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/dirs
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/debian/files b/openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/files
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/debian/files
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/files
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/debian/openair-hss.install b/openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/openair-hss.install
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/debian/openair-hss.install
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/openair-hss.install
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/debian/rules b/openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/rules
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/debian/rules
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/debian/rules
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/hss_main.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/hss_main.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/hss_main.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/hss_main.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/Makefile.am b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/Makefile.am
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/Makefile.am
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/Makefile.am
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_auth_info.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_auth_info.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_auth_info.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_auth_info.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_common.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_common.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_common.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_common.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_error.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_error.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_error.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_error.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_fd.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_fd.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_fd.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_fd.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_in_addr.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_in_addr.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_in_addr.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_in_addr.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_peers.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_peers.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_peers.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_peers.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_proto.h b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_proto.h
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_proto.h
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_proto.h
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_purge_ue.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_purge_ue.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_purge_ue.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_purge_ue.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_subscription_data.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_subscription_data.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_subscription_data.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_subscription_data.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_supported_features.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_supported_features.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_supported_features.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_supported_features.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_supported_features.h b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_supported_features.h
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_supported_features.h
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_supported_features.h
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_up_loc.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_up_loc.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/s6a/s6a_up_loc.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/s6a/s6a_up_loc.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/Makefile.am b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/Makefile.am
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/Makefile.am
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/Makefile.am
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_fd.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_fd.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_fd.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_fd.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_fd.h b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_fd.h
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_fd.h
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_fd.h
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_kdf.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_kdf.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_kdf.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_kdf.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_security.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_security.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_security.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_security.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_security_f1.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_security_f1.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_security_f1.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_security_f1.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_security_f2_f3_f5.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_security_f2_f3_f5.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_security_f2_f3_f5.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_security_f2_f3_f5.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_security_f4_f5star.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_security_f4_f5star.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_security_f4_f5star.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_security_f4_f5star.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_security_kasme.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_security_kasme.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_security_kasme.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_security_kasme.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_utils.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_utils.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_utils.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_utils.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_utils.h b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_utils.h
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/test_utils.h
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/test_utils.h
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/tests/up_loc_test.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/up_loc_test.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/tests/up_loc_test.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/tests/up_loc_test.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/utils/Makefile.am b/openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/Makefile.am
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/utils/Makefile.am
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/Makefile.am
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/utils/conversion.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/conversion.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/utils/conversion.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/conversion.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/utils/conversion.h b/openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/conversion.h
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/utils/conversion.h
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/conversion.h
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/utils/hss_config.c b/openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/hss_config.c
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/utils/hss_config.c
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/hss_config.c
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/utils/hss_config.h b/openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/hss_config.h
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/utils/hss_config.h
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/hss_config.h
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/utils/hss_parser.y b/openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/hss_parser.y
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/utils/hss_parser.y
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/hss_parser.y
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/utils/hss_scanner.l b/openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/hss_scanner.l
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/utils/hss_scanner.l
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/hss_scanner.l
diff --git a/openair-cn/OPENAIRHSS/OPENAIRHSS/utils/queue.h b/openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/queue.h
similarity index 100%
rename from openair-cn/OPENAIRHSS/OPENAIRHSS/utils/queue.h
rename to openair-cn/OPENAIRHSS_/OPENAIRHSS/utils/queue.h