Rename classes

Conflicts:
	project.properties