improved naming convention