<itemMapping> and <blockMapping> is now both simply <mapping>