Prefix and Suffix changes to correct markup