improved naming conventions