Store results from analysis + refactor names