Fixed email and key names to match paths