rework of prefixes