add fold & rename abbreviators