diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-checkinstall smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-checkinstall
--- smeserver-freepbx-0.1.old/root/etc/e-smith/events/actions/freepbx-checkinstall	2016-05-15 03:05:48.955000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/events/actions/freepbx-checkinstall	2016-05-15 03:38:40.023000000 -0400
@@ -11,10 +11,10 @@
         mysql -e "grant all privileges on $DBNAME.* to '$DBUSER'@'localhost' identified by '$DBPASS';"
         mysql -e 'flush privileges;'
 
-        if [ -e /usr/share/freepbx/sources/freepbx/SQL/newinstall.sql ]; then
-                mysql $DBNAME < /usr/share/freepbx/sources/freepbx/SQL/newinstall.sql
+        if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then
+                mysql $DBNAME < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql
         else
-                echo "Error: file /usr/share/freepbx/sources/freepbx/SQL/newinstall.sql dosen't exists"
+                echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists"
                 exit 1
         fi
 fi
@@ -23,10 +23,10 @@
         mysql -e "create database $CDRDBNAME;"
         mysql -e "grant all privileges on $CDRDBNAME.* to '$DBUSER'@'localhost' identified by '$DBPASS';"
         mysql -e 'flush privileges;'
-        if [ -e /usr/share/freepbx/sources/freepbx/SQL/cdr_mysql_table.sql ]; then
-                mysql $CDRDBNAME < /usr/share/freepbx/sources/freepbx/SQL/cdr_mysql_table.sql
+        if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql ]; then
+                mysql $CDRDBNAME < /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql
         else
-                echo "Error: file /usr/share/freepbx/sources/freepbx/SQL/cdr_mysql_table.sql dosen't exists"
+                echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql doesn't exists"
                 exit 1
         fi
 fi
diff -Nur smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database
--- smeserver-freepbx-0.1.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database	2016-05-15 03:05:48.939000000 -0400
+++ smeserver-freepbx-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/30freepbx_mysql_create_database	2016-05-15 03:15:39.198000000 -0400
@@ -12,20 +12,20 @@
 if [ ! -d /var/lib/mysql/$dbname ]; then
     mysqladmin create $dbname
 
-    if [ -e /usr/lib/freepbx/SQL/newinstall.sql ]; then
-        mysql $dbname < /usr/lib/freepbx/SQL/newinstall.sql
+    if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql ]; then
+        mysql $dbname < /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql
     else
-        echo "Error: file /usr/lib/freepbx/SQL/newinstall.sql dosen't exists"
+        echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/asterisk.sql doesn't exists"
         exit 1
     fi
 fi
 
 if [ ! -d /var/lib/mysql/$cdrdbname ]; then
     mysqladmin create $cdrdbname
-    if [ -e /usr/lib/freepbx/SQL/cdr_mysql_table.sql ]; then
-        mysql $cdrdbname < /usr/lib/freepbx/SQL/cdr_mysql_table.sql
+    if [ -e /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql ]; then
+        mysql $cdrdbname < /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql
     else
-        echo "Error: file /usr/lib/freepbx/SQL/cdr_mysql_table.sql dosen't exists"
+        echo "Error: file /usr/share/freepbx/sources/freepbx/installlib/SQL/cdr.sql doesn't exists"
         exit 1
     fi
 fi