Clean up xmj@'s suffix patch, add a prefix, use it everywhere