You act like these are well defined and agreed upon categories. The page on consciousness you link lists off many different definitions people attribute to consciousness, including: "It may be 'awareness', or 'awareness of awareness', or self-awareness."