Cleaned up related names.