Table name is already resolved during modules indexing.

Also added '-' to '_' conversion for flat_id.