Renaming some old dineromail vars and const