class/object naming improved