Fix map for Subvert and add a simple abbreviation