Improved aspect naming.