clean up terminology for layouts and associated handlers