naming improvement - part 2 (untested)