The new name follows the pattern of the name suggesting which layout protocol the parent expects the child to speak. Fixes #8664