FIX: Revert modular visual names