#3578: replace partialName with custom string parsing