Extracted TE registration, added config option for older TE naming.