Improved naming conventions