Unit class name improvements.