Fixed table name and namespace issue