Changed email and fixed a naming problem.