Cleaned up detailed names