Added descriptions and made the names friendlier