Modified custom types to require comment 'type-hinting' and made sure type names are valid.