fix issue #40 and add full type names like 'string' and 'integer'