Removed old name source method and unused encode shortcuts.