Fixed issue with naming tables