remove flow references from filenames

CMakeLists.txt

@@ -2,14 +2,14 @@
 ####################
 CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)
 
-PROJECT(flow_device_manager)
+PROJECT(device_manager)
 # This will be extended to take the version from SCM
 # Version config can be simplified from 3.0+
-SET(flow_device_manager_VERSION_MAJOR 0)
-SET(flow_device_manager_VERSION_MINOR 3)
-SET(flow_device_managern_VERSION_PATCH 0)
-SET(flow_device_manager_VERSION
-    ${flow_device_manager_VERSION_MAJOR}.${flow_device_manager_VERSION_MINOR}.${flow_device_manager_VERSION_PATCH})
+SET(device_manager_VERSION_MAJOR 0)
+SET(device_manager_VERSION_MINOR 3)
+SET(device_manager_VERSION_PATCH 0)
+SET(device_manager_VERSION
+    ${device_manager_VERSION_MAJOR}.${device_manager_VERSION_MINOR}.${device_manager_VERSION_PATCH})
 
 # Options
 ###################

src/CMakeLists.txt

@@ -1,22 +1,22 @@
 # Add library targets
 #####################
-SET(SOURCES flow_device_manager.c fdm_register.c fdm_subscribe.c fdm_licensee_verification.c
+SET(SOURCES device_manager.c fdm_register.c fdm_subscribe.c fdm_licensee_verification.c
 	fdm_hmac.c fdm_server_session.c fdm_get_client_list.c fdm_provision_constrained.c)
-ADD_LIBRARY(flowdevicemanager SHARED ${SOURCES})
+ADD_LIBRARY(devicemanager SHARED ${SOURCES})
 
 INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(JSON ${STRICT_CHECK} json-c)
 INCLUDE_DIRECTORIES(${JSON_INCLUDE_DIRS})
 
 FIND_LIBRARY(LIB_AWA libawa.so PATHS ${STAGING_DIR}/usr/lib)
-TARGET_LINK_LIBRARIES(flowdevicemanager ${LIB_AWA} json-c blobmsg_json)
+TARGET_LINK_LIBRARIES(devicemanager ${LIB_AWA} json-c blobmsg_json)
 
 # Add executable targets
 ########################
-ADD_EXECUTABLE(flow_device_manager_ubusd flow_device_manager_ubus.c)
-TARGET_LINK_LIBRARIES(flow_device_manager_ubusd flowdevicemanager ubus ubox json-c blobmsg_json)
+ADD_EXECUTABLE(device_manager_ubusd device_manager_ubus.c)
+TARGET_LINK_LIBRARIES(device_manager_ubusd devicemanager ubus ubox json-c blobmsg_json)
 
 # Add install targets
 ######################
-INSTALL(TARGETS flowdevicemanager LIBRARY DESTINATION lib)
-INSTALL(TARGETS flow_device_manager_ubusd RUNTIME DESTINATION bin)
+INSTALL(TARGETS devicemanager LIBRARY DESTINATION lib)
+INSTALL(TARGETS device_manager_ubusd RUNTIME DESTINATION bin)

src/flow_device_manager.c → src/device_manager.c

@@ -29,7 +29,7 @@
  */
 
 /**
- * @file flow_device_manager.c
+ * @file device_manager.c
  * @brief Provides provisioning operations.
  */
 
@@ -43,7 +43,7 @@
 #include <unistd.h>
 #include "awa/common.h"
 #include "awa/client.h"
-#include "flow_device_manager.h"
+#include "device_manager.h"
 #include "fdm_register.h"
 #include "fdm_subscribe.h"
 #include "fdm_licensee_verification.h"

src/flow_device_manager.h → src/device_manager.h

@@ -29,12 +29,12 @@
  */
 
 /**
- * @file flow_device_manager.h
- * @brief Header file for exposing flow device manager functions.
+ * @file device_manager.h
+ * @brief Header file for exposing device manager functions.
  */
 
-#ifndef FLOW_DEVICE_MANAGER_H
-#define FLOW_DEVICE_MANAGER_H
+#ifndef DEVICE_MANAGER_H
+#define DEVICE_MANAGER_H
 
 #include <stdbool.h>
 #include <json.h>
@@ -138,4 +138,4 @@ ProvisionStatus ProvisionConstrainedDevice(const char *clientID, const char *fca
  */
 bool IsConstrainedDeviceProvisioned(const char* clientID);
 
-#endif	/* FLOW_DEVICE_MANAGER_H */
+#endif	/* DEVICE_MANAGER_H */

src/flow_device_manager_ubus.c → src/device_manager_ubus.c

@@ -29,7 +29,7 @@
  */
 
 /**
- * @file flow_device_manager_ubus.c
+ * @file device_manager_ubus.c
  * @brief Provides provisioning operations.
  */
 
@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "flow_device_manager.h"
+#include "device_manager.h"
 #include "fdm_log.h"
 
 /***************************************************************************************************

src/fdm_provision_constrained.c

@@ -47,7 +47,7 @@
 #include <string.h>
 #include "awa/common.h"
 #include "awa/server.h"
-#include "flow_device_manager.h"
+#include "device_manager.h"
 #include "fdm_common.h"
 #include "fdm_log.h"
 #include "fdm_server_session.h"

src/fdm_provision_constrained.h

@@ -31,7 +31,7 @@
 #ifndef FDM_PROVISION_CONSTRAINED_H
 #define FDM_PROVISION_CONSTRAINED_H
 
-#include "flow_device_manager.h"
+#include "device_manager.h"
 #include "awa/server.h"
 
 /**