diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17e6dde970ab25cc3df31b770a09c6dc88660085..32061f4a19694d7f30ae27495b7629fea524105e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ if (POLICY CMP0042)
   cmake_policy(SET CMP0042 NEW)
 endif()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
 #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules)
 
 # compilation mode setup
diff --git a/package_bgs/IBGS.h b/package_bgs/IBGS.h
index eb9858d5d83b425efaa72ab3523e6b5ecd0740ba..67a05684610fb70b130d871593b40a269de3d967 100644
--- a/package_bgs/IBGS.h
+++ b/package_bgs/IBGS.h
@@ -88,13 +88,13 @@ namespace bgslibrary
     class BGS_Factory
     {
     public:
-      static BGS_Factory* BGS_Factory::Instance()
+      static BGS_Factory* Instance()
       {
         static BGS_Factory factory;
         return &factory;
       }
 
-      std::shared_ptr<IBGS> BGS_Factory::Create(std::string name)
+      std::shared_ptr<IBGS> Create(std::string name)
       {
         IBGS* instance = nullptr;
 
@@ -110,7 +110,7 @@ namespace bgslibrary
           return nullptr;
       }
 
-      std::vector<std::string> BGS_Factory::GetRegisteredAlgorithmsName()
+      std::vector<std::string> GetRegisteredAlgorithmsName()
       {
         std::vector<std::string> algorithmsName;
         for (auto it = factoryFunctionRegistry.begin(); it != factoryFunctionRegistry.end(); ++it) {
@@ -119,7 +119,7 @@ namespace bgslibrary
         return algorithmsName;
       }
 
-      void BGS_Factory::RegisterFactoryFunction(std::string name,
+      void RegisterFactoryFunction(std::string name,
         std::function<IBGS*(void)> classFactoryFunction)
       {
         // register the class factory function