Tidying up auto-generated prefixes