Minor renaming of stuff

Signed-off-by: THE DINJ <thedinj@yahoo.com>
fix merge
Merge branch 'master' of https://github.com/thedinj/Siegfried

Conflicts:
	Notes/Siegfried/Brainstorming.one