Improved naming convention