Modify type names (more explicit) and adjust commentaries.