Change logic constants to logic variables