PREFIX -> prefix, minor tweaks