Refactor, improve Multipart model

refs #15674
single backticks here as well