fix trailing comma
port example to new nomenclature
rebuild