Cleaned up '@name'