Cleaned up the names.