Renamings in Q table and constants