rework class/constructor names