Adjust variable prefixes