More naming tweaks, plus disable plugin mechanism