Table Call fix. Some fixes in main name were required for compatibility