Changing table names
Merge remote-tracking branch 'origin/master'
Changing script names and fixing an error on function file