Re-inserted old names for compatibility with older Django version.