Changed naming and updated demos.