Fixed handling of table namess