Rename internal theorem and lemma labels for clarity
Merge branch 'master' into lemma_7

Conflicts:
	Paper.tex