diff --git a/include/eal.h b/include/eal.h
index 1f81642f4ceb26b97744bc35b7918f8bf00a5a1c..016aa88e62e8a36a61135fd6d914699b63e50903 100644
--- a/include/eal.h
+++ b/include/eal.h
@@ -1,21 +1,25 @@
-#ifndef EAL_H
-#define EAL_H
+#ifndef EAL_INCLUDE_EAL_H
+#define EAL_INCLUDE_EAL_H
 
 #include <vector>
-#include <string.h>
+#include <string>
 
 using namespace std;
 
-vector<double> getPosition(vector<vector<double>> coords, vector<double> coeffs, char *interp, double time);
-vector<double> getVelocity(vector<vector<double>> coords, vector<double> coeffs, char *interp, double time, bool interpolation);
+namespace eal {
 
-vector<double> getPosition(vector<double> coeffs, char *interp, double time);
-vector<double> getVelocity(vector<double> coeffs, char *interp, double time, bool interpolation);
+  vector<double> getPosition(vector<vector<double>> coords, vector<double> times, string interp, double time);
+  vector<double> getVelocity(vector<vector<double>> coords, vector<double> times, string interp, double time, bool interpolation);
 
-vector<double> getRotation(char *from, char *to, vector<vector<double>> rotations, vector<double> times, char *interp, double time);
-vector<double> getAngularVelocity(char *from, char *to, vector<vector<double>> rotations, vector<double> times, char *interp, double time);
+  vector<double> getPosition(vector<double> coeffs, string interp, double time);
+  vector<double> getVelocity(vector<double> coeffs, string interp, double time, bool interpolation);
 
-vector<double> getRotation(char *from, char *to, vector<double> coefficients, char *interp, double time);
-vector<double> getAngularVelocity(char *from, char *to, vector<double> coefficients, char *interp, double time);
+  vector<double> getRotation(string from, string to, vector<vector<double>> rotations, vector<double> times, string interp, double time);
+  vector<double> getAngularVelocity(string from, string to, vector<vector<double>> rotations, vector<double> times, string interp, double time);
+
+  vector<double> getRotation(string from, string to, vector<double> coefficients, string interp, double time);
+  vector<double> getAngularVelocity(string from, string to, vector<double> coefficients, string interp, double time);
+
+}
 
 #endif // EAL_H
diff --git a/src/eal.cpp b/src/eal.cpp
index b523c36ce7f82c289f2a58ace1262f9a856c8218..629d3cbd899dd02c81672357c235c1287bda4dfe 100644
--- a/src/eal.cpp
+++ b/src/eal.cpp
@@ -1,25 +1,27 @@
 #include "eal.h"
 
+using namespace eal;
+
 // Positional Functions
 
 // Position Data Functions
-vector<double> getPosition(vector<vector<double>> coords, vector<double> coeffs, char *interp, double time) {
+vector<double> getPosition(vector<vector<double>> coords, vector<double> times, string interp, double time) {
   vector<double> coordinate = {0.0, 0.0, 0.0};
   return coordinate;
 }
 
-vector<double> getVelocity(vector<vector<double>> coords, vector<double> coeffs, char *interp, double time, bool interpolation) {
+vector<double> getVelocity(vector<vector<double>> coords, vector<double> times, string interp, double time, bool interpolation) {
   vector<double> coordinate = {0.0, 0.0, 0.0};
   return coordinate;
 }
 
 // Postion Function Functions
-vector<double> getPosition(vector<double> coeffs, char *interp, double time) {
+vector<double> getPosition(vector<double> coeffs, string interp, double time) {
   vector<double> coordinate = {0.0, 0.0, 0.0};
   return coordinate;
 }
 
-vector<double> getVelocity(vector<double> coeffs, char *interp, double time, bool interpolation) {
+vector<double> getVelocity(vector<double> coeffs, string interp, double time, bool interpolation) {
   vector<double> coordinate = {0.0, 0.0, 0.0};
   return coordinate;
 }
@@ -27,23 +29,23 @@ vector<double> getVelocity(vector<double> coeffs, char *interp, double time, boo
 // Rotation Data Functions
 
 // Rotation Data Functions
-vector<double> getRotation(char *from, char *to, vector<vector<double>> rotations, vector<double> times, char *interp, double time) {
+vector<double> getRotation(string from, string to, vector<vector<double>> rotations, vector<double> times, string interp, double time) {
   vector<double> coordinate = {0.0, 0.0, 0.0};
   return coordinate;
 }
 
-vector<double> getAngularVelocity(char *from, char *to, vector<vector<double>> rotations, vector<double> times, char *interp, double time) {
+vector<double> getAngularVelocity(string from, string to, vector<vector<double>> rotations, vector<double> times, string interp, double time) {
   vector<double> coordinate = {0.0, 0.0, 0.0};
   return coordinate;
 }
 
 // Rotation Function Functions
-vector<double> getRotation(char *from, char *to, vector<double> coefficients, char *interp, double time) {
+vector<double> getRotation(string from, string to, vector<double> coefficients, string interp, double time) {
   vector<double> coordinate = {0.0, 0.0, 0.0};
   return coordinate;
 }
 
-vector<double> getAngularVelocity(char *from, char *to, vector<double> coefficients, char *interp, double time) {
+vector<double> getAngularVelocity(string from, string to, vector<double> coefficients, string interp, double time) {
   vector<double> coordinate = {0.0, 0.0, 0.0};
   return coordinate;
 }