improved naming scheme