rename definitions in demo