fix variable names for prefixes