FTS-793:Changing name table and primary keys for optimizer

1 job for develop in 13 seconds (queued for 2 seconds)