Change TYPE and ROWTYPE, Adjust Type Capture

Added the % to the beginning of TYPE and ROWTYPE. Changed TYPE capture
to correctly match entity name.