This same logic for extracting the portletName and then checking for the suffix is done in the Wizard class.  We should only do this logic once... Since we do it in the Wizard class we should save the output of that code in a new property or something so that we don't have to duplicate that logic here.