More consistency with variables names

Conflicts:
	src/main.cpp