diff --git a/runtime/include/current_sandbox.h b/runtime/include/current_sandbox.h
index ad768d5..48676fd 100644
--- a/runtime/include/current_sandbox.h
+++ b/runtime/include/current_sandbox.h
@@ -150,7 +150,7 @@ current_sandbox_get_http_request_body(char **body)
 static inline int
 current_sandbox_set_http_response_header(char *header, int length)
 {
-	return http_response__set_header(&current_sandbox_get()->http_response, header, length);
+	return http_response_set_header(&current_sandbox_get()->http_response, header, length);
 }
 
 /**
@@ -162,7 +162,7 @@ current_sandbox_set_http_response_header(char *header, int length)
 static inline int
 current_sandbox_set_http_response_body(char *body, int length)
 {
-	return http_response__set_body(&current_sandbox_get()->http_response, body, length);
+	return http_response_set_body(&current_sandbox_get()->http_response, body, length);
 }
 
 /**
@@ -174,7 +174,7 @@ current_sandbox_set_http_response_body(char *body, int length)
 static inline int
 current_sandbox_set_http_response_status(char *status, int length)
 {
-	return http_response__set_status(&current_sandbox_get()->http_response, status, length);
+	return http_response_set_status(&current_sandbox_get()->http_response, status, length);
 }
 
 /**
@@ -184,7 +184,7 @@ current_sandbox_set_http_response_status(char *status, int length)
 static inline int
 current_sandbox_vectorize_http_response(void)
 {
-	return http_response__encode_as_vector(&current_sandbox_get()->http_response);
+	return http_response_encode_as_vector(&current_sandbox_get()->http_response);
 }
 
 
diff --git a/runtime/include/http_response.h b/runtime/include/http_response.h
index 510b318..90c1617 100644
--- a/runtime/include/http_response.h
+++ b/runtime/include/http_response.h
@@ -32,9 +32,9 @@ struct http_response {
 /***************************************************
  * General HTTP Response Functions                 *
  **************************************************/
-int http_response__encode_as_vector(struct http_response *http_response);
-int http_response__set_body(struct http_response *http_response, char *body, int length);
-int http_response__set_header(struct http_response *http_response, char *h, int length);
-int http_response__set_status(struct http_response *http_response, char *status, int length);
+int http_response_encode_as_vector(struct http_response *http_response);
+int http_response_set_body(struct http_response *http_response, char *body, int length);
+int http_response_set_header(struct http_response *http_response, char *h, int length);
+int http_response_set_status(struct http_response *http_response, char *status, int length);
 
 #endif /* SFRT_HTTP_RESPONSE_H */
diff --git a/runtime/src/http_response.c b/runtime/src/http_response.c
index d9c87da..b74362a 100644
--- a/runtime/src/http_response.c
+++ b/runtime/src/http_response.c
@@ -14,7 +14,7 @@
  * @returns the number of buffers used to store the HTTP Response
  **/
 int
-http_response__encode_as_vector(struct http_response *http_response)
+http_response_encode_as_vector(struct http_response *http_response)
 {
 	int buffer_count = 0;
 
@@ -69,7 +69,7 @@ http_response__encode_as_vector(struct http_response *http_response)
  * @returns 0 (abends program in case of error)
  **/
 int
-http_response__set_body(struct http_response *http_response, char *body, int length)
+http_response_set_body(struct http_response *http_response, char *body, int length)
 {
 	// assert(length <= sandbox->module->max_response_size);
 	http_response->body        = body;
@@ -86,7 +86,7 @@ http_response__set_body(struct http_response *http_response, char *body, int len
  * @returns 0 (abends program in case of error)
  **/
 int
-http_response__set_header(struct http_response *http_response, char *header, int length)
+http_response_set_header(struct http_response *http_response, char *header, int length)
 {
 	assert(http_response->header_count < HTTP__MAX_HEADER_COUNT);
 	http_response->header_count++;
@@ -104,7 +104,7 @@ http_response__set_header(struct http_response *http_response, char *header, int
  * @returns 0 (abends program in case of error)
  **/
 int
-http_response__set_status(struct http_response *http_response, char *status, int length)
+http_response_set_status(struct http_response *http_response, char *status, int length)
 {
 	http_response->status        = status;
 	http_response->status_length = length;