Revert "Name changes"

This reverts commit 96506fabbe027234e60bf67eeaaf6b80ee87e9a1.

Conflicts:
	recaptcha.php