added clearer naming scheme