Corrected an issue with table names with dashes