Rename display/block and inline and hierachy to Display/block and inline and hierachy