change static names to simple ones