Fixed Obfuscated names... for nei handler