Replaced prefixes and suffixes to match Motrr specific Macros. Read inline comments for more details.