Revised naming conventions