Bipolar 1 mania includes psychosis, unlike hypomania of any kind. Psychotic features with mania is one of the hallmarks of BP 1. Bipolar 2 mania has no psychotic features.

Either can be "hypo-" (meaning "under") manic.

This is a great thread; thanks widgets.