Improved naming