Ported over to the latest incoming. Removed deprecated extern module names.