Revised naming