improved naming throughout