1. Fix bug in getBaseName where it mishandles suffixes