Improved naming conventions.